diff options
| -rw-r--r-- | whats-cooking.txt | 226 |
1 files changed, 117 insertions, 109 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index 47b6d1d..7e1e17c 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org Bcc: lwn@lwn.net -Subject: What's cooking in git.git (Aug 2019, #02; Fri, 2) +Subject: What's cooking in git.git (Aug 2019, #03; Tue, 6) X-master-at: 7c20df84bd21ec0215358381844274fa10515017 X-next-at: deed80330f2f849fecaf1d22eaf715b93ef96954 -What's cooking in git.git (Aug 2019, #02; Fri, 2) +What's cooking in git.git (Aug 2019, #03; Tue, 6) -------------------------------------------------- Here are the topics that have been cooking. Commits prefixed with @@ -12,10 +12,11 @@ Here are the topics that have been cooking. Commits prefixed with '+' are in 'next'. The ones marked with '.' do not appear in any of the integration branches, but I am still holding onto them. -The first release candidate for 2.23 has been tagged. "git log" -will by default honor the ".mailmap" file like "git shortlog" does, -which is a backward-incompatible change that is shipped without big -fanfare. +There are a few last-minute fix-up topics in flight, which I'll be +merging to 'next' and then down to 'master' soonish, before rc2. +They are marked as "Will merge to 'next' and then to 'master'" in +this report; please raise hand if some of them are not ready or +appropriate, to stop me before too late. You can find the changes described here in the integration branches of the repositories listed at @@ -23,84 +24,101 @@ of the repositories listed at http://git-blame.blogspot.com/p/git-public-repositories.html -------------------------------------------------- -[Graduated to "master"] - -* jc/log-mailmap-flip-defaults (2019-08-02) 2 commits - - log: really flip the --mailmap default - (merged to 'next' on 2019-08-01 at 80cddd7895) - + log: flip the --mailmap default unconditionally - - Hotfix for making "git log" use the mailmap by default. - - -* js/early-config-with-onbranch (2019-07-31) 1 commit - (merged to 'next' on 2019-08-01 at 26b713c824) - + config: work around bug with includeif:onbranch and early config - - The recently added [includeif "onbranch:branch"] feature does not - work well with an early config mechanism, as it attempts to find - out what branch we are on before we even haven't located the git - repository. The inclusion during early config scan is ignored to - work around this issue. - - -* js/visual-studio (2019-07-29) 23 commits - + git: avoid calling aliased builtins via their dashed form - + bin-wrappers: append `.exe` to target paths if necessary - + .gitignore: ignore Visual Studio's temporary/generated files - + .gitignore: touch up the entries regarding Visual Studio - + vcxproj: also link-or-copy builtins - + msvc: add a Makefile target to pre-generate the Visual Studio solution - + contrib/buildsystems: add a backend for modern Visual Studio versions - + contrib/buildsystems: handle options starting with a slash - + contrib/buildsystems: also handle -lexpat - + contrib/buildsystems: handle libiconv, too - + contrib/buildsystems: handle the curl library option - + contrib/buildsystems: error out on unknown option - + contrib/buildsystems: optionally capture the dry-run in a file - + contrib/buildsystems: redirect errors of the dry run into a log file - + contrib/buildsystems: ignore gettext stuff - + contrib/buildsystems: handle quoted spaces in filenames - + contrib/buildsystems: fix misleading error message - + contrib/buildsystems: ignore irrelevant files in Generators/ - + contrib/buildsystems: ignore invalidcontinue.obj - + Vcproj.pm: urlencode '<' and '>' when generating VC projects - + Vcproj.pm: do not configure VCWebServiceProxyGeneratorTool - + Vcproj.pm: list git.exe first to be startup project - + Vcproj.pm: auto-generate GUIDs - - Support building Git with Visual Studio - - The bits about .git/branches/* have been dropped from the series. - We may want to drop the support for it, but until that happens, the - tests should rely on the existence of the support to pass. - - -* sg/fsck-config-in-doc (2019-07-29) 1 commit - + Documentation/git-fsck.txt: include fsck.* config variables - - Doc update. - --------------------------------------------------- [New Topics] -* cb/pcre2-chartables-leakfix (2019-08-02) 1 commit - - grep: avoid leak of chartables in PCRE2 +* ds/commit-graph-octopus-fix (2019-08-05) 1 commit + - commit-graph: fix bug around octopus merges + commit-graph did not handle commits with more than two parents + correctly, which has been corrected. -* jh/trace2-pretty-output (2019-08-01) 3 commits - - trace2: trim whitespace in region messages in perf target format - - trace2: trim whitespace in start message in perf target format - - trace2: cleanup column alignment in perf target format + Will merge to 'next' and then to 'master'. -* sc/pack-refs-deletion-racefix (2019-08-02) 1 commit - - pack-refs: always refresh after taking the lock file +* mr/doc-can-not-to-cannot (2019-08-05) 1 commit + - doc: typo: s/can not/cannot/ and s/is does/does/ + Docfix. -* vn/restore-empty-ita-corner-case-fix (2019-08-02) 2 commits - - restore: add test for deleted ita files - - checkout.c: unstage empty deleted ita files + Will merge to 'next' and then to 'master'. + + +* nd/switch-and-restore (2019-08-05) 1 commit + - restore: fix typo in docs + + Docfix. + + Will merge to 'next' and then to 'master'. + + +* sg/commit-graph-validate (2019-08-05) 3 commits + - commit-graph: error out on invalid commit oids in 'write --stdin-commits' + - commit-graph: turn a group of write-related macro flags into an enum + - t5318-commit-graph: use 'test_expect_code' + + The code to write commit-graph over given commit object names has + been made a bit more robust. + + Will merge to 'next'. + + +* sg/show-failed-test-names (2019-08-05) 2 commits + - tests: show the test name and number at the start of verbose output + - t0000-basic: use realistic test script names in the verbose tests + + The first line of verbose output from each test piece now carries + the test name and number to help scanning with eyeballs. + + Will merge to 'next'. + + +* en/disable-dir-rename-in-recursive-merge (2019-08-06) 1 commit + - merge-recursive: avoid directory rename detection in recursive case + + "merge-recursive" hit a BUG() when building a virtual merge base + detected a directory rename. + + Will merge to 'next' and then to 'master'. + + +* js/pre-merge-commit-hook (2019-08-06) 4 commits + - merge: --no-verify to bypass pre-merge-commit hook + - git-merge: honor pre-merge-commit hook + - merge: do no-verify like commit + - t7503: verify proper hook execution + + A new "pre-merge-commit" hook has been introduced. + + +* ja/l10n-fixes (2019-08-06) 1 commit + - l10n: reformat some localized strings for v2.23.0 + + A few messages have been updated to help localization better. + + Will merge to 'next' and then to 'master'. + + +* jk/eoo (2019-08-06) 3 commits + - gitcli: document --end-of-options + - parse-options: allow --end-of-options as a synonym for "--" + - revision: allow --end-of-options to end option parsing + + The command line parser learned "--end-of-options" notation; the + standard convention for scripters to have hardcoded set of options + first on the command line, and force the command to treat end-user + input as non-options, has been to use "--" as the delimiter, but + that would not work for commands that use "--" as a delimiter + between revs and pathspec. + + Will merge to 'next'. + + +* jk/repo-init-cleanup (2019-08-06) 3 commits + - config: stop checking whether the_repository is NULL + - common-main: delay trace2 initialization + - t1309: use short branch name in includeIf.onbranch test + + Further clean-up of the initialization code. -------------------------------------------------- [Stalled] @@ -175,6 +193,29 @@ of the repositories listed at -------------------------------------------------- [Cooking] +* cb/pcre2-chartables-leakfix (2019-08-06) 3 commits + - grep: avoid leak of chartables in PCRE2 + - grep: make PCRE2 aware of custom allocator + - grep: make PCRE1 aware of custom allocator + + WIP. + + +* jh/trace2-pretty-output (2019-08-01) 3 commits + - trace2: trim whitespace in region messages in perf target format + - trace2: trim whitespace in start message in perf target format + - trace2: cleanup column alignment in perf target format + + +* sc/pack-refs-deletion-racefix (2019-08-02) 1 commit + - pack-refs: always refresh after taking the lock file + + +* vn/restore-empty-ita-corner-case-fix (2019-08-02) 2 commits + - restore: add test for deleted ita files + - checkout.c: unstage empty deleted ita files + + * ds/feature-macros (2019-07-30) 5 commits - repo-settings: create feature.experimental setting - repo-settings: create feature.manyFiles setting @@ -410,36 +451,3 @@ of the repositories listed at On hold. cf. <20190508001252.15752-1-avarab@gmail.com> cf. <20190719210156.GA9688@archbookpro.localdomain> - --------------------------------------------------- -[Discarded] - -* nd/index-dump-in-json (2019-06-26) 11 commits - . SQUASH??? - . t3008: use the new SINGLE_CPU prereq - . read-cache.c: dump "IEOT" extension as json - . read-cache.c: dump "EOIE" extension as json - . resolve-undo.c: dump "REUC" extension as json - . fsmonitor.c: dump "FSMN" extension as json - . split-index.c: dump "link" extension as json - . dir.c: dump "UNTR" extension as json - . cache-tree.c: dump "TREE" extension as json - . read-cache.c: dump common extension info in json - . ls-files: add --json to dump the index - - "ls-files" learned "--debug-json" option to dump the contents and - the extensions of the index file. - - Retracted at least for now. - cf. <CACsJy8A8fJZq6k2i_e0EpkxN8SZ4+8h1FA0eV6e9xFLaMDcsPg@mail.gmail.com> - - -* ds/early-access (2019-07-01) 3 commits - . repo-settings: pack.useSparse=true - . repo-settings: use index.version=4 by default - . repo-settings: create core.featureAdoptionRate setting - - A mechanism to enable newish configuration settings in bulk has - been invented. - - ds/feature-macros has replaced this topic. |