What's cooking (2021/07 #02)

1 files changed, 598 insertions, 713 deletions

diff --git a/whats-cooking.txt b/whats-cooking.txt
index b66f14c305..8d0854ad1f 100644
--- a/whats-cooking.txt
+++ b/whats-cooking.txt
@@ -1,27 +1,22 @@
 To: git@vger.kernel.org
 Bcc: lwn@lwn.net
-Subject: What's cooking in git.git (Jul 2021, #01; Tue, 6)
-X-master-at: 670b81a890388c60b7032a4f5b879f2ece8c4558
-X-next-at: 7674896d58f7c91447ddcd64037ff660f9387632
+Subject: What's cooking in git.git (Jul 2021, #02; Thu, 8)
+X-master-at: d486ca60a51c9cb1fe068803c3f540724e95e83a
+X-next-at: 085311d9fa98621e847267e9cea4a891cc4ca32e
 
-What's cooking in git.git (Jul 2021, #01; Tue, 6)
+What's cooking in git.git (Jul 2021, #02; Thu, 8)
 --------------------------------------------------
 
 Here are the topics that have been cooking in my tree.  Commits
-prefixed with '-' are only in 'seen' while 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.  Generally,
-being in 'next' is a sign that a topic is stable enough to be used
-and are candidate to be in a future release, while being in 'seen'
-means nothing more than that the maintainer has found it interesting
-for some reason (like "it may have hard-to-resolve conflicts with
+prefixed with '+' are in 'next' (being in 'next' is a sign that a
+topic is stable enough to be used and are candidate to be in a
+future release).  Commits prefixed with '-' are only in 'seen',
+which means nothing more than that I have found them of interest for
+some reason (like "it may have hard-to-resolve conflicts with
 another topic already in flight" or "this may turn out to be
-useful")---do not read too much into a topic being in (or not in)
-'seen'.
-
-Among those that are in 'seen', I haven't summarized many of them in
-this issue of report (let alone decided what to do with them).  Help
-and patience is greatly appreciated.
+useful").  Do not read too much into a topic being in (or not in)
+'seen'.  The ones marked with '.' do not appear in any of the
+integration branches, but I am still holding onto them.
 
 Copies of the source code to Git live in many repositories, and the
 following is a list of the ones I push into or their mirrors.  Some
@@ -52,131 +47,307 @@ Release tarballs are available at:
 	https://www.kernel.org/pub/software/scm/git/
 
 --------------------------------------------------
-[New Topics]
+[Graduated to 'master']
 
-* ab/lib-subtest (2021-07-01) 8 commits
- - test-lib tests: assert 1 exit code, not non-zero
- - test-lib tests: refactor common part of check_sub_test_lib_test*()
- - test-lib tests: avoid subshell for "test_cmp" for readability
- - test-lib tests: get rid of copy/pasted mock test code
- - test-lib tests: don't provide a description for the sub-tests
- - test-lib tests: stop using a subshell in write_sub_test_lib_test()
- - test-lib tests: split up "write and run" into two functions
- - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
+* ab/cmd-foo-should-return (2021-06-09) 1 commit
+  (merged to 'next' on 2021-07-02 at 4f91c90007)
+ + builtins + test helpers: use return instead of exit() in cmd_*
 
- Refactor tests on test framework.
+ Code clean-up.
 
- WHat's the review status of this thing?
 
+* ab/config-hooks-path-testfix (2021-06-16) 1 commit
+  (merged to 'next' on 2021-07-01 at 2ab6dbe8af)
+ + pre-commit hook tests: don't leave "actual" nonexisting on failure
 
-* ab/struct-init (2021-07-01) 5 commits
- - string-list.h users: change to use *_{nodup,dup}()
- - string-list.[ch]: add a string_list_init_{nodup,dup}()
- - dir.[ch]: replace dir_init() with DIR_INIT
- - *.c *_init(): define in terms of corresponding *_INIT macro
- - *.h: move some *_INIT to designated initializers
+ Test fix.
 
- Code cleanup around struct_type_init() functions.
 
- Will merge to 'next'.
+* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit
+  (merged to 'next' on 2021-07-01 at e8cbef661b)
+ + test-lib.sh: set COLUMNS=80 for --verbose repeatability
 
+ Output from some of our tests were affected by the width of the
+ terminal that they were run in, which has been corrected by
+ exporting a fixed value in the COLUMNS environment.
 
-* bc/inactive-submodules (2021-07-02) 1 commit
- - submodule: mark submodules with update=none as inactive
 
- Usability update for inactive submodules.
+* ab/progress-cleanup (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at 288570c95a)
+ + read-cache.c: don't guard calls to progress.c API
 
- Will merge to 'next'.
+ Code clean-up.
 
 
-* en/ort-perf-batch-14 (2021-07-01) 7 commits
- - merge-ort: restart merge with cached renames to reduce process entry cost
- - merge-ort: avoid recursing into directories when we don't need to
- - merge-ort: defer recursing into directories when merge base is matched
- - merge-ort: add a handle_deferred_entries() helper function
- - merge-ort: add data structures for allowable trivial directory resolves
- - merge-ort: add some more explanations in collect_merge_info_callback()
- - merge-ort: resolve paths early when we have sufficient information
+* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at f4920ba6d1)
+ + xdiff: use BUG(...), not xdl_bug(...)
 
- Further optimization on "merge -sort" backend.
+ Code clean-up.
 
 
-* ar/help-micro-cleanup (2021-07-06) 1 commit
- - help: convert git_cmd to page in one place
+* ah/graph-typofix (2021-06-15) 1 commit
+  (merged to 'next' on 2021-07-01 at c71fb8cbcb)
+ + graph: improve grammar of "invalid color" error message
 
- Tiny code clean-up.
+ Typofix in an error message.
+
+
+* ah/uninitialized-reads-fix (2021-06-15) 3 commits
+  (merged to 'next' on 2021-07-01 at 61a967c340)
+ + builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
+ + split-index: use oideq instead of memcmp to compare object_id's
+ + bulk-checkin: make buffer reuse more obvious and safer
 
- Will merge to 'next.
+ Make the codebase MSAN clean.
 
 
-* ar/submodule-helper-include-cleanup (2021-07-06) 1 commit
- - submodule--helper: remove redundant include
+* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
+  (merged to 'next' on 2021-07-02 at a0e3a1f5f2)
+ + MyFirstContribution: link #git-devel to Libera Chat
+
+ Update MyFirst document.
+
+
+* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
+  (merged to 'next' on 2021-07-02 at e5122960c0)
+ + mailinfo: use starts_with() when checking scissors
 
  Code clean-up.
 
- Will merge to 'next'.
 
+* ar/more-typofix (2021-06-28) 3 commits
+  (merged to 'next' on 2021-07-01 at 02ca61ee96)
+ + git-worktree.txt: fix typo in example path
+ + t: fix typos in test messages
+ + blame: correct name of config option in docs
 
-* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
- - fetch: fix segfault on --set-upstream while on a detached HEAD
+ Typofixes.
 
- "git fetch --set-upstream" while on detached HEAD segfaulted
- instead of noticing that such an operation did not make sense.
 
- Expecting a reroll.
+* ar/test-code-cleanup (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at 12d23f8a42)
+ + t: fix whitespace around &&
 
+ Test code clean-up.
 
-* dd/test-stdout-count-lines (2021-07-06) 3 commits
- - t6402: preserve git exit status code
- - t6400: preserve git ls-files exit status code
- - test-lib-functions: introduce test_stdout_line_count
 
- Tiny test clean-up.
+* ar/typofix (2021-06-14) 1 commit
+  (merged to 'next' on 2021-07-01 at 8d10d6d568)
+ + *: fix typos which duplicate a word
 
- Will merge to 'next'.
+ Typofixes.
 
 
-* hn/refs-iterator-peel-returns-boolean (2021-05-20) 1 commit
- - refs: make explicit that ref_iterator_peel returns boolean
- (this branch is used by hn/reftable.)
+* ba/object-info (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at c7fb4f900e)
+ + protocol-caps.h: add newline at end of file
 
- Tiny API tweak.
+ Code clean-up.
 
- Will merge to 'next'.
 
+* dd/document-log-decorate-default (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at 529d71a690)
+ + doc/log: correct default for --decorate
 
-* hn/refs-test-cleanup (2021-07-06) 2 commits
- - t7509: avoid direct file access for writing CHERRY_PICK_HEAD
- - t1415: avoid direct filesystem access for writing refs
+ Doc clean-up.
 
- Test clean-up.
+
+* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-01 at 9fa432af22)
+ + t: use user-specified utf-8 locale for testing svn
+
+ "git-svn" tests assumed that "locale -a", which is used to pick an
+ available UTF-8 locale, is available everywhere.  A knob has been
+ introduced to allow testers to specify a suitable locale to use.
+
+
+* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-01 at 3ce7d14f26)
+ + doc: merge: mention default of defaulttoupstream
+
+ Doc clean-up.
+
+
+* fc/pull-cleanups (2021-06-19) 3 commits
+  (merged to 'next' on 2021-07-01 at f8d7a3fc78)
+ + pull: trivial whitespace style fix
+ + pull: trivial cleanup
+ + pull: cleanup autostash check
+
+ Code cleanup.
+
+
+* fw/complete-cmd-idx-fix (2021-06-19) 1 commit
+  (merged to 'next' on 2021-07-01 at f16784c4cb)
+ + completion: bash: fix late declaration of __git_cmd_idx
+
+ Recent update to completion script (in contrib/) broke those who
+ use the __git_complete helper to define completion to their custom
+ command.
+
+
+* jk/bitmap-tree-optim (2021-06-15) 1 commit
+  (merged to 'next' on 2021-07-01 at 2e0f108bb6)
+ + bitmaps: don't recurse into trees already in the bitmap
+
+ Avoid duplicated work while building reachability bitmaps.
+
+
+* jk/doc-max-pack-size (2021-06-09) 1 commit
+  (merged to 'next' on 2021-07-02 at b272fddb22)
+ + doc: warn people against --max-pack-size
+
+ Doc update.
+
+
+* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
+  (merged to 'next' on 2021-07-01 at 28f4da3e7d)
+ + add_pending_object_with_path(): work around "gcc -O3" complaint
+
+ Warning fix.
+
+
+* jk/test-avoid-globmatch-with-skip-patterns (2021-07-01) 1 commit
+  (merged to 'next' on 2021-07-01 at 139fa916d1)
+ + test-lib: avoid accidental globbing in match_pattern_list()
+
+ We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
+ update, which got fixed.
+
+
+* jk/test-without-readlink-1 (2021-06-19) 1 commit
+  (merged to 'next' on 2021-07-01 at fb3bf5a6b0)
+ + t: use portable wrapper for readlink(1)
+
+ Some test scripts assumed that readlink(1) was universally
+ installed and available, which is not the case.
+
+
+* js/no-more-multimail (2021-06-11) 1 commit
+  (merged to 'next' on 2021-07-01 at ed7a4efc75)
+ + multimail: stop shipping a copy
+
+ Remove multimail from contrib/
+
+
+* js/stop-exporting-bogus-columns (2021-06-28) 1 commit
+  (merged to 'next' on 2021-07-02 at 7674896d58)
+ + pager: avoid setting COLUMNS when we're guessing its value
+
+ When we cannot figure out how wide the terminal is, we use a
+ fallback value of 80 ourselves (which cannot be avoided), but when
+ we run the pager, we export it in COLUMNS, which forces the pager
+ to use the hardcoded value, even when the pager is perfectly
+ capable to figure it out itself.  Stop exporting COLUMNS when we
+ fall back on the hardcoded default value for our own use.
+
+
+* js/subtree-on-windows-fix (2021-06-15) 2 commits
+  (merged to 'next' on 2021-07-01 at d4e4ccde63)
+ + subtree: fix assumption about the directory separator
+ + subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
+
+ Update "git subtree" to work better on Windows.
+
+
+* js/trace2-discard-event-docfix (2021-06-04) 1 commit
+  (merged to 'next' on 2021-07-01 at 9fc3c6285e)
+ + docs: fix api-trace2 doc for "too_many_files" event
+
+ Docfix.
+
+
+* jv/userdiff-csharp-update (2021-06-16) 1 commit
+  (merged to 'next' on 2021-07-01 at a2371d0580)
+ + userdiff: add support for C# record types
+
+ The userdiff pattern for C# learned the token "record".
+
+
+* jx/sideband-cleanup (2021-06-17) 4 commits
+  (merged to 'next' on 2021-07-01 at 0eb604e8c2)
+ + test: refactor to use "get_abbrev_oid" to get abbrev oid
+ + test: refactor to use "test_commit" to create commits
+ + test: compare raw output, not mangle tabs and spaces
+ + sideband: don't lose clear-to-eol at packet boundary
+
+ The side-band demultiplexer that is used to display progress output
+ from the remote end did not clear the line properly when the end of
+ line hits at a packet boundary, which has been corrected.  Also
+ comes with test clean-ups.
+
+
+* jx/t6020-with-older-bash (2021-06-17) 1 commit
+  (merged to 'next' on 2021-07-01 at 55d71ed779)
+ + t6020: fix incompatible parameter expansion
+
+ Work around inefficient glob substitution in older versions of bash
+ by rewriting parts of a test.
+
+
+* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
+  (merged to 'next' on 2021-07-02 at 5ca2515f34)
+ + mergetools/kdiff3: make kdiff3 work on Windows too
+
+ On Windows, mergetool has been taught to find kdiff3.exe just like
+ it finds winmerge.exe.
+
+
+* tb/complete-diff-anchored (2021-05-31) 1 commit
+  (merged to 'next' on 2021-07-01 at 19878daaa9)
+ + completion: add --anchored to diff's options
+
+ The command line completion (in contrib/) learned that "git diff"
+ takes the "--anchored" option.
+
+
+* tk/partial-clone-repack-doc (2021-06-04) 1 commit
+  (merged to 'next' on 2021-07-01 at fe4c6280bc)
+ + Remove warning that repack only works on non-promisor packfiles
+
+ Docfix.
+
+--------------------------------------------------
+[New Topics]
+
+* ab/gitignore-discovery-doc (2021-07-06) 1 commit
+ - docs: .gitignore parsing is to the top of the repo
+
+ Doc update.
 
  Will merge to 'next'.
 
 
-* ps/perf-with-separate-output-directory (2021-07-02) 1 commit
- - perf: fix when running with TEST_OUTPUT_DIRECTORY
+* bc/rev-list-without-commit-line (2021-07-06) 1 commit
+ - rev-list: add option for --pretty without header
 
- Test update.
+ "git rev-list" learns to omit the "commit <object-name>" header
+ lines from the output with the `--no-commit-header` option.
 
- What's the status of this one?
+ Will merge to 'next'.
 
 
-* rs/khash-alloc-cleanup (2021-07-06) 1 commit
- - khash: clarify that allocations never fail
+* ab/imap-send-read-everything-simplify (2021-07-07) 1 commit
+ - imap-send.c: use less verbose strbuf_fread() idiom
 
- Code clean-up.
+ Code simplification.
 
  Will merge to 'next'.
 
 
-* sm/worktree-add-lock (2021-07-06) 1 commit
- - worktree: teach `add` to accept --reason <string> with --lock
+* ab/pkt-line-tests (2021-07-07) 5 commits
+ - test-lib-functions.sh: remove unused [de]packetize() functions
+ - tests: replace remaining packetize() with "test-tool pkt-line"
+ - tests: replace [de]packetize() shell+perl test-tool pkt-line
+ - serve tests: use test_cmp in "protocol violations" test
+ - serve tests: add missing "extra delim" test
 
- "git worktree add --lock" learned to record why the worktree is
- locked with a custom message.
+ Update tests to cover a bit more protocol bits and unify two
+ similar test helpers into one.
+
+ Will merge to 'next'.
 
- Expecting a reroll.
 
 --------------------------------------------------
 [Stalled]
@@ -237,52 +408,139 @@ Release tarballs are available at:
 --------------------------------------------------
 [Cooking]
 
-* fw/complete-cmd-idx-fix (2021-06-19) 1 commit
-  (merged to 'next' on 2021-07-01 at f16784c4cb)
- + completion: bash: fix late declaration of __git_cmd_idx
+* ab/lib-subtest (2021-07-01) 8 commits
+ - test-lib tests: assert 1 exit code, not non-zero
+ - test-lib tests: refactor common part of check_sub_test_lib_test*()
+ - test-lib tests: avoid subshell for "test_cmp" for readability
+ - test-lib tests: get rid of copy/pasted mock test code
+ - test-lib tests: don't provide a description for the sub-tests
+ - test-lib tests: stop using a subshell in write_sub_test_lib_test()
+ - test-lib tests: split up "write and run" into two functions
+ - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
 
- Recent update to completion script (in contrib/) broke those who
- use the __git_complete helper to define completion to their custom
- command.
+ Refactor tests on test framework.
 
- Will merge to 'master'.
+ What's the review status of this thing?
 
 
-* jk/test-avoid-globmatch-with-skip-patterns (2021-07-01) 1 commit
-  (merged to 'next' on 2021-07-01 at 139fa916d1)
- + test-lib: avoid accidental globbing in match_pattern_list()
+* ab/struct-init (2021-07-01) 5 commits
+ - string-list.h users: change to use *_{nodup,dup}()
+ - string-list.[ch]: add a string_list_init_{nodup,dup}()
+ - dir.[ch]: replace dir_init() with DIR_INIT
+ - *.c *_init(): define in terms of corresponding *_INIT macro
+ - *.h: move some *_INIT to designated initializers
 
- We broke "GIT_SKIP_TESTS=t?000" to skip certain tests in recent
- update, which got fixed.
+ Code cleanup around struct_type_init() functions.
 
- Will merge to 'master'.
+ Will merge to 'next'.
 
 
-* jk/test-without-readlink-1 (2021-06-19) 1 commit
-  (merged to 'next' on 2021-07-01 at fb3bf5a6b0)
- + t: use portable wrapper for readlink(1)
+* bc/inactive-submodules (2021-07-02) 1 commit
+ - submodule: mark submodules with update=none as inactive
 
- Some test scripts assumed that readlink(1) was universally
- installed and available, which is not the case.
+ Usability update for inactive submodules.
 
- Will merge to 'master'.
+ Under review.
+ cf. <fc5ec100-1d42-4199-236e-7a99c9218f38@gmail.com>
 
 
-* jx/sideband-cleanup (2021-06-17) 4 commits
-  (merged to 'next' on 2021-07-01 at 0eb604e8c2)
- + test: refactor to use "get_abbrev_oid" to get abbrev oid
- + test: refactor to use "test_commit" to create commits
- + test: compare raw output, not mangle tabs and spaces
- + sideband: don't lose clear-to-eol at packet boundary
+* en/ort-perf-batch-14 (2021-07-01) 7 commits
+ - merge-ort: restart merge with cached renames to reduce process entry cost
+ - merge-ort: avoid recursing into directories when we don't need to
+ - merge-ort: defer recursing into directories when merge base is matched
+ - merge-ort: add a handle_deferred_entries() helper function
+ - merge-ort: add data structures for allowable trivial directory resolves
+ - merge-ort: add some more explanations in collect_merge_info_callback()
+ - merge-ort: resolve paths early when we have sufficient information
 
- The side-band demultiplexer that is used to display progress output
- from the remote end did not clear the line properly when the end of
- line hits at a packet boundary, which has been corrected.  Also
- comes with test clean-ups.
+ Further optimization on "merge -sort" backend.
+
+ Reviews?
+
+
+* ar/help-micro-cleanup (2021-07-06) 1 commit
+ - help: convert git_cmd to page in one place
+
+ Tiny code clean-up.
+
+ Will merge to 'next'.
+
+
+* ar/submodule-helper-include-cleanup (2021-07-06) 1 commit
+ - submodule--helper: remove redundant include
+
+ Code clean-up.
+
+ Will merge to 'next'.
+
+
+* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
+ - fetch: fix segfault on --set-upstream while on a detached HEAD
+
+ "git fetch --set-upstream" while on detached HEAD segfaulted
+ instead of noticing that such an operation did not make sense.
+
+ Expecting a reroll.
+
+
+* dd/test-stdout-count-lines (2021-07-06) 3 commits
+ - t6402: preserve git exit status code
+ - t6400: preserve git ls-files exit status code
+ - test-lib-functions: introduce test_stdout_line_count
+
+ Tiny test clean-up.
+
+ Will merge to 'next'.
+
+
+* hn/refs-iterator-peel-returns-boolean (2021-05-20) 1 commit
+  (merged to 'next' on 2021-07-08 at b9b35881ba)
+ + refs: make explicit that ref_iterator_peel returns boolean
+ (this branch is used by hn/reftable.)
+
+ Tiny API tweak.
 
  Will merge to 'master'.
 
 
+* hn/refs-test-cleanup (2021-07-06) 2 commits
+ - t7509: avoid direct file access for writing CHERRY_PICK_HEAD
+ - t1415: avoid direct filesystem access for writing refs
+
+ Test clean-up.
+
+ Will merge to 'next'.
+
+
+* ps/perf-with-separate-output-directory (2021-07-02) 1 commit
+ - perf: fix when running with TEST_OUTPUT_DIRECTORY
+
+ Test update.
+
+ What's the status of this one?
+
+
+* rs/khash-alloc-cleanup (2021-07-06) 1 commit
+ - khash: clarify that allocations never fail
+
+ Code clean-up.
+
+ Will merge to 'next'.
+
+
+* sm/worktree-add-lock (2021-07-08) 3 commits
+ - worktree: teach `add` to accept --reason <string> with --lock
+ - worktree: default lock string should be marked with `_()` for translation
+ - t2400: remove unneeded `git rev-parse` from '"add" worktree with lock' test
+
+ "git worktree add --lock" learned to record why the worktree is
+ locked with a custom message.
+
+ Expecting a reroll?
+ cf. <pull.992.v2.git.1625759443.gitgitgadget@gmail.com>
+ cf. <CAPig+cSsPrQrP9xk8M8H339_NpYqKh1okeo1V-fAJ2zk3QeOjQ@mail.gmail.com>
+
+
 * ab/bundle-doc (2021-07-02) 3 commits
  - bundle doc: elaborate on rev<->ref restriction
  - bundle doc: elaborate on object prerequisites
@@ -294,17 +552,6 @@ Release tarballs are available at:
  at least for the second patch.
 
 
-* ab/fix-columns-to-80-during-tests (2021-06-29) 1 commit
-  (merged to 'next' on 2021-07-01 at e8cbef661b)
- + test-lib.sh: set COLUMNS=80 for --verbose repeatability
-
- Output from some of our tests were affected by the width of the
- terminal that they were run in, which has been corrected by
- exporting a fixed value in the COLUMNS environment.
-
- Will merge to 'master'.
-
-
 * ab/pack-stdin-packs-fix (2021-06-28) 2 commits
  - pack-objects: fix segfault in --stdin-packs option
  - pack-objects tests: cover blindspots in stdin handling
@@ -316,31 +563,22 @@ Release tarballs are available at:
  cf. <YND3h2l10PlnSNGJ@nand.local>
 
 
-* ar/more-typofix (2021-06-28) 3 commits
-  (merged to 'next' on 2021-07-01 at 02ca61ee96)
- + git-worktree.txt: fix typo in example path
- + t: fix typos in test messages
- + blame: correct name of config option in docs
-
- Typofixes.
-
- Will merge to 'master'.
-
-
 * bk/doc-commit-typofix (2021-06-28) 1 commit
- - Documentation: fix typo in the --patch option of the commit command
+  (merged to 'next' on 2021-07-06 at 88580c54ed)
+ + Documentation: fix typo in the --patch option of the commit command
 
  Doc typo/grammo-fix.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * dc/p4-binary-submit-fix (2021-06-28) 1 commit
- - git-p4: fix failed submit by skip non-text data files
+  (merged to 'next' on 2021-07-06 at dec280fdc6)
+ + git-p4: fix failed submit by skip non-text data files
 
  Prevent "git p4" from failing to submit changes to binary file.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ds/commit-and-checkout-with-sparse-index (2021-06-28) 5 commits
@@ -358,17 +596,18 @@ Release tarballs are available at:
 
 
 * en/merge-dir-rename-corner-case-fix (2021-06-30) 3 commits
- - merge-recursive: handle rename-to-self case
- - merge-ort: ensure we consult df_conflict and path_conflicts
- - t6423: test directory renames causing rename-to-self
+  (merged to 'next' on 2021-07-08 at cf7087576e)
+ + merge-recursive: handle rename-to-self case
+ + merge-ort: ensure we consult df_conflict and path_conflicts
+ + t6423: test directory renames causing rename-to-self
 
  The merge code had funny interactions between content based rename
  detection and directory rename detection.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
-* ew/many-alternate-optim (2021-06-29) 5 commits
+* ew/many-alternate-optim (2021-07-07) 5 commits
  - oidtree: a crit-bit tree for odb_loose_cache
  - oidcpy_with_padding: constify `src' arg
  - make object_directory.loose_objects_subdir_seen a bitmap
@@ -377,21 +616,22 @@ Release tarballs are available at:
 
  Optimization for repositories with many alternate object store.
 
- Will merge to 'next'.
+ Will merge to 'next'?
 
 
 * jk/log-decorate-optim (2021-06-28) 6 commits
- - add_ref_decoration(): rename s/type/deco_type/
- - load_ref_decorations(): avoid parsing non-tag objects
- - object.h: add lookup_object_by_type() function
- - object.h: expand docstring for lookup_unknown_object()
- - log: avoid loading decorations for userformats that don't need it
- - pretty.h: update and expand docstring for userformat_find_requirements()
+  (merged to 'next' on 2021-07-08 at a3b6f978ab)
+ + add_ref_decoration(): rename s/type/deco_type/
+ + load_ref_decorations(): avoid parsing non-tag objects
+ + object.h: add lookup_object_by_type() function
+ + object.h: expand docstring for lookup_unknown_object()
+ + log: avoid loading decorations for userformats that don't need it
+ + pretty.h: update and expand docstring for userformat_find_requirements()
 
  Optimize "git log" for cases where we wasted cycles to load ref
  decoration data that may not be needed.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * js/ci-windows-update (2021-07-06) 7 commits
@@ -405,23 +645,27 @@ Release tarballs are available at:
 
  GitHub Actions / CI update.
 
+ Will merge to 'next'.
+
 
 * js/config-mak-windows-pcre-fix (2021-06-28) 1 commit
- - config.mak.uname: PCRE1 cleanup
+  (merged to 'next' on 2021-07-08 at fe457da682)
+ + config.mak.uname: PCRE1 cleanup
 
  Whitespace fix.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * js/gfw-system-config-loc-fix (2021-06-28) 3 commits
- - config: normalize the path of the system gitconfig
- - cmake(windows): set correct path to the system Git config
- - mingw: move Git for Windows' system config where users expect it
+  (merged to 'next' on 2021-07-08 at 91a090ab50)
+ + config: normalize the path of the system gitconfig
+ + cmake(windows): set correct path to the system Git config
+ + mingw: move Git for Windows' system config where users expect it
 
  Update the location of system-side configuration file on Windows.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * jt/push-negotiation-fixes (2021-06-28) 3 commits
@@ -436,62 +680,68 @@ Release tarballs are available at:
 
 
 * ks/submodule-cleanup (2021-06-28) 1 commit
- - submodule: remove unnecessary `prefix` based option logic
+  (merged to 'next' on 2021-07-08 at 03ba93067f)
+ + submodule: remove unnecessary `prefix` based option logic
 
  Code cleanup.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * rs/grep-parser-fix (2021-06-30) 1 commit
- - grep: report missing left operand of --and
+  (merged to 'next' on 2021-07-06 at 8c582fcd64)
+ + grep: report missing left operand of --and
 
  "git grep --and -e foo" ought to have been diagnosed as an error
  but instead segfaulted, which has been corrected.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * tb/midx-use-checksum (2021-06-28) 4 commits
- - midx: report checksum mismatches during 'verify'
- - midx: don't reuse corrupt MIDXs when writing
- - commit-graph: rewrite to use checksum_valid()
- - csum-file: introduce checksum_valid()
+  (merged to 'next' on 2021-07-08 at bbaac9c721)
+ + midx: report checksum mismatches during 'verify'
+ + midx: don't reuse corrupt MIDXs when writing
+ + commit-graph: rewrite to use checksum_valid()
+ + csum-file: introduce checksum_valid()
 
  When rebuilding the multi-pack index file reusing an existing one,
  we used to blindly trust the existing file and ended up carrying
  corrupted data into the updated file, which has been corrected.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/bundle-updates (2021-07-06) 3 commits
- - bundle: remove "ref_list" in favor of string-list.c API
- - bundle.c: use a temporary variable for OIDs and names
- - bundle cmd: stop leaking memory from parse_options_cmd_bundle()
+  (merged to 'next' on 2021-07-08 at 0c9c54fad7)
+ + bundle: remove "ref_list" in favor of string-list.c API
+ + bundle.c: use a temporary variable for OIDs and names
+ + bundle cmd: stop leaking memory from parse_options_cmd_bundle()
 
  Code clean-up and leak plugging in "git bundle".
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
-* ab/fetch-negotiate-segv-fix (2021-06-30) 3 commits
- - fetch: fix segfault in --negotiate-only without --negotiation-tip=*
- - fetch: document the --negotiate-only option
- - send-pack.c: move "no refs in common" abort earlier
+* ab/fetch-negotiate-segv-fix (2021-07-08) 3 commits
+  (merged to 'next' on 2021-07-08 at 30dcd90ea6)
+ + fetch: fix segfault in --negotiate-only without --negotiation-tip=*
+ + fetch: document the --negotiate-only option
+ + send-pack.c: move "no refs in common" abort earlier
 
- Code recently added to support common ancestory negotiation during
+ Code recently added to support common ancestry negotiation during
  "git push" did not sanity check its arguments carefully enough.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/make-delete-on-error (2021-06-29) 1 commit
- - Makefile: add and use the ".DELETE_ON_ERROR" flag
+  (merged to 'next' on 2021-07-08 at 787d70d2d6)
+ + Makefile: add and use the ".DELETE_ON_ERROR" flag
 
  Use ".DELETE_ON_ERROR" pseudo target to simplify our Makefile.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/make-tags-cleanup (2021-06-29) 5 commits
@@ -510,11 +760,12 @@ Release tarballs are available at:
 
 
 * ew/mmap-failures (2021-06-29) 1 commit
- - xmmap: inform Linux users of tuning knobs on ENOMEM
+  (merged to 'next' on 2021-07-08 at e0e19d5d26)
+ + xmmap: inform Linux users of tuning knobs on ENOMEM
 
  Error message update.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * tb/multi-pack-bitmaps (2021-06-28) 24 commits
@@ -576,45 +827,47 @@ Release tarballs are available at:
 
 
 * ab/describe-tests-fix (2021-05-11) 5 commits
- - describe tests: support -C in "check_describe"
- - describe tests: fix nested "test_expect_success" call
- - describe tests: don't rely on err.actual from "check_describe"
- - describe tests: refactor away from glob matching
- - describe tests: improve test for --work-tree & --dirty
+  (merged to 'next' on 2021-07-06 at ba1f7c0364)
+ + describe tests: support -C in "check_describe"
+ + describe tests: fix nested "test_expect_success" call
+ + describe tests: don't rely on err.actual from "check_describe"
+ + describe tests: refactor away from glob matching
+ + describe tests: improve test for --work-tree & --dirty
 
  Various updates to tests around "git describe"
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/pickaxe-pcre2 (2021-05-11) 22 commits
- - xdiff-interface: replace discard_hunk_line() with a flag
- - xdiff users: use designated initializers for out_line
- - pickaxe -G: don't special-case create/delete
- - pickaxe -G: terminate early on matching lines
- - xdiff-interface: allow early return from xdiff_emit_line_fn
- - xdiff-interface: prepare for allowing early return
- - pickaxe -S: slightly optimize contains()
- - pickaxe: rename variables in has_changes() for brevity
- - pickaxe -S: support content with NULs under --pickaxe-regex
- - pickaxe: assert that we must have a needle under -G or -S
- - pickaxe: refactor function selection in diffcore-pickaxe()
- - perf: add performance test for pickaxe
- - pickaxe/style: consolidate declarations and assignments
- - diff.h: move pickaxe fields together again
- - pickaxe: die when --find-object and --pickaxe-all are combined
- - pickaxe: die when -G and --pickaxe-regex are combined
- - pickaxe tests: add missing test for --no-pickaxe-regex being an error
- - pickaxe tests: test for -G, -S and --find-object incompatibility
- - pickaxe tests: add test for "log -S" not being a regex
- - pickaxe tests: add test for diffgrep_consume() internals
- - pickaxe tests: refactor to use test_commit --append --printf
- - grep/pcre2 tests: reword comments referring to kwset
+  (merged to 'next' on 2021-07-06 at fdb4fdc245)
+ + xdiff-interface: replace discard_hunk_line() with a flag
+ + xdiff users: use designated initializers for out_line
+ + pickaxe -G: don't special-case create/delete
+ + pickaxe -G: terminate early on matching lines
+ + xdiff-interface: allow early return from xdiff_emit_line_fn
+ + xdiff-interface: prepare for allowing early return
+ + pickaxe -S: slightly optimize contains()
+ + pickaxe: rename variables in has_changes() for brevity
+ + pickaxe -S: support content with NULs under --pickaxe-regex
+ + pickaxe: assert that we must have a needle under -G or -S
+ + pickaxe: refactor function selection in diffcore-pickaxe()
+ + perf: add performance test for pickaxe
+ + pickaxe/style: consolidate declarations and assignments
+ + diff.h: move pickaxe fields together again
+ + pickaxe: die when --find-object and --pickaxe-all are combined
+ + pickaxe: die when -G and --pickaxe-regex are combined
+ + pickaxe tests: add missing test for --no-pickaxe-regex being an error
+ + pickaxe tests: test for -G, -S and --find-object incompatibility
+ + pickaxe tests: add test for "log -S" not being a regex
+ + pickaxe tests: add test for diffgrep_consume() internals
+ + pickaxe tests: refactor to use test_commit --append --printf
+ + grep/pcre2 tests: reword comments referring to kwset
 
  Rewrite the backend for "diff -G/-S" to use pcre2 engine when
  available.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/config-based-hooks-base (2021-06-29) 33 commits
@@ -659,15 +912,6 @@ Release tarballs are available at:
  Waiting for reviews.
 
 
-* ab/config-hooks-path-testfix (2021-06-16) 1 commit
-  (merged to 'next' on 2021-07-01 at 2ab6dbe8af)
- + pre-commit hook tests: don't leave "actual" nonexisting on failure
-
- Test fix.
-
- Will merge to 'master'.
-
-
 * ab/doc-retire-alice-bob (2021-06-16) 6 commits
  - pack-protocol doc: use "www-data" in place of "alice"
  - doc: replace "alice" and "bob" with "jdoe" and "msmith"
@@ -679,34 +923,32 @@ Release tarballs are available at:
  Documentation update to avoid Alice and Bob in contexts where Eve
  does not appear in.
 
+ Will discard.
+ Let's shelve this one for now, as it does not seem to solve any
+ real problems (other than ceasing to use Alice and Bob in contexts
+ that do not call for Eve).
+
 
 * ab/pre-auto-gc-hook-test (2021-06-16) 1 commit
- - gc tests: add a test for the "pre-auto-gc" hook
+  (merged to 'next' on 2021-07-06 at 305a15ee1d)
+ + gc tests: add a test for the "pre-auto-gc" hook
 
  Test fix.
 
- Will merge to 'next'.
-
-
-* jv/userdiff-csharp-update (2021-06-16) 1 commit
-  (merged to 'next' on 2021-07-01 at a2371d0580)
- + userdiff: add support for C# record types
-
- The userdiff pattern for C# learned the token "record".
-
  Will merge to 'master'.
 
 
 * en/ort-perf-batch-13 (2021-06-28) 5 commits
- - merge-ort: add prefetching for content merges
- - diffcore-rename: use a different prefetch for basename comparisons
- - diffcore-rename: allow different missing_object_cb functions
- - t6421: add tests checking for excessive object downloads during merge
- - promisor-remote: output trace2 statistics for number of objects fetched
+  (merged to 'next' on 2021-07-08 at 39aad121d3)
+ + merge-ort: add prefetching for content merges
+ + diffcore-rename: use a different prefetch for basename comparisons
+ + diffcore-rename: allow different missing_object_cb functions
+ + t6421: add tests checking for excessive object downloads during merge
+ + promisor-remote: output trace2 statistics for number of objects fetched
 
  Performance tweaks of "git merge -sort" around lazy fetching of objects.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/serve-cleanup (2021-06-28) 8 commits
@@ -721,77 +963,18 @@ Release tarballs are available at:
 
  Code clean-up around "git serve".
 
-
-* js/stop-exporting-bogus-columns (2021-06-28) 1 commit
-  (merged to 'next' on 2021-07-02 at 7674896d58)
- + pager: avoid setting COLUMNS when we're guessing its value
-
- When we cannot figure out how wide the terminal is, we use a
- fallback value of 80 ourselves (which cannot be avoided), but when
- we run the pager, we export it in COLUMNS, which forces the pager
- to use the hardcoded value, even when the pager is perfectly
- capable to figure it out itself.  Stop exporting COLUMNS when we
- fall back on the hardcoded default value for our own use.
-
- Will merge to 'master'.
-
-
-* ah/uninitialized-reads-fix (2021-06-15) 3 commits
-  (merged to 'next' on 2021-07-01 at 61a967c340)
- + builtin/checkout--worker: zero-initialise struct to avoid MSAN complaints
- + split-index: use oideq instead of memcmp to compare object_id's
- + bulk-checkin: make buffer reuse more obvious and safer
-
- Make the codebase MSAN clean.
-
- Will merge to 'master'.
-
-
-* ar/typofix (2021-06-14) 1 commit
-  (merged to 'next' on 2021-07-01 at 8d10d6d568)
- + *: fix typos which duplicate a word
-
- Typofixes.
-
- Will merge to 'master'.
-
-
-* jk/revision-squelch-gcc-warning (2021-06-11) 1 commit
-  (merged to 'next' on 2021-07-01 at 28f4da3e7d)
- + add_pending_object_with_path(): work around "gcc -O3" complaint
-
- Warning fix.
-
- Will merge to 'master'.
+ Comments?
 
 
 * jk/union-merge-binary (2021-06-11) 3 commits
- - ll_union_merge(): rename path_unused parameter
- - ll_union_merge(): pass name labels to ll_xdl_merge()
- - ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
+  (merged to 'next' on 2021-07-06 at 5e77055895)
+ + ll_union_merge(): rename path_unused parameter
+ + ll_union_merge(): pass name labels to ll_xdl_merge()
+ + ll_binary_merge(): handle XDL_MERGE_FAVOR_UNION
 
  The "union" conflict resultion variant misbehaved when used with
  binary merge driver.
 
- Will merge to 'next'.
-
-
-* js/no-more-multimail (2021-06-11) 1 commit
-  (merged to 'next' on 2021-07-01 at ed7a4efc75)
- + multimail: stop shipping a copy
-
- Remove multimail from contrib/
-
- Will merge to 'master'.
-
-
-* js/subtree-on-windows-fix (2021-06-15) 2 commits
-  (merged to 'next' on 2021-07-01 at d4e4ccde63)
- + subtree: fix assumption about the directory separator
- + subtree: fix the GIT_EXEC_PATH sanity check to work on Windows
-
- Update "git subtree" to work better on Windows.
-
  Will merge to 'master'.
 
 
@@ -805,39 +988,32 @@ Release tarballs are available at:
  Prepare the internals for lazily fetching objects in submodules
  from their promisor remotes.
 
- Waiting for reviews.
+ Will merge to 'next'.
 
 
 * ab/mktag-tests (2021-06-28) 6 commits
- - mktag tests: test fast-export
- - mktag tests: test for-each-ref
- - mktag tests: test update-ref and reachable fsck
- - mktag tests: test hash-object --literally and unreachable fsck
- - mktag tests: invert --no-strict test
- - mktag tests: parse out options in helper
+  (merged to 'next' on 2021-07-08 at bfd55b0a38)
+ + mktag tests: test fast-export
+ + mktag tests: test for-each-ref
+ + mktag tests: test update-ref and reachable fsck
+ + mktag tests: test hash-object --literally and unreachable fsck
+ + mktag tests: invert --no-strict test
+ + mktag tests: parse out options in helper
 
  Fill test gaps.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/show-branch-tests (2021-06-28) 4 commits
- - show-branch tests: add missing tests
- - show-branch: don't <COLOR></RESET> for space characters
- - show-branch tests: modernize test code
- - show-branch tests: rename the one "show-branch" test file
+  (merged to 'next' on 2021-07-08 at 47f90868cf)
+ + show-branch tests: add missing tests
+ + show-branch: don't <COLOR></RESET> for space characters
+ + show-branch tests: modernize test code
+ + show-branch tests: rename the one "show-branch" test file
 
  Fill test gaps.
 
- Will merge to 'next'.
-
-
-* ah/graph-typofix (2021-06-15) 1 commit
-  (merged to 'next' on 2021-07-01 at c71fb8cbcb)
- + graph: improve grammar of "invalid color" error message
-
- Typofix in an error message.
-
  Will merge to 'master'.
 
 
@@ -854,36 +1030,6 @@ Release tarballs are available at:
  Waiting for reviews.
 
 
-* fc/pull-cleanups (2021-06-19) 3 commits
-  (merged to 'next' on 2021-07-01 at f8d7a3fc78)
- + pull: trivial whitespace style fix
- + pull: trivial cleanup
- + pull: cleanup autostash check
-
- Code cleanup.
-
- Will merge to 'master'.
-
-
-* jk/bitmap-tree-optim (2021-06-15) 1 commit
-  (merged to 'next' on 2021-07-01 at 2e0f108bb6)
- + bitmaps: don't recurse into trees already in the bitmap
-
- Avoid duplicated work while building reachability bitmaps.
-
- Will merge to 'master'.
-
-
-* jx/t6020-with-older-bash (2021-06-17) 1 commit
-  (merged to 'next' on 2021-07-01 at 55d71ed779)
- + t6020: fix incompatible parameter expansion
-
- Work around inefficient glob substitution in older versions of bash
- by rewriting parts of a test.
-
- Will merge to 'master'.
-
-
 * en/zdiff3 (2021-06-15) 2 commits
  - update documentation for new zdiff3 conflictStyle
  - xdiff: implement a zealous diff3, or "zdiff3"
@@ -913,8 +1059,7 @@ Release tarballs are available at:
  cf. <094f5e5f-d447-8867-a9a7-be5c8827bba6@gmail.com>
 
 
-* hn/refs-errno-cleanup (2021-07-06) 7 commits
- - SQUASH???
+* hn/refs-errno-cleanup (2021-07-07) 6 commits
  - refs: make errno output explicit for refs_resolve_ref_unsafe
  - refs: explicitly return failure_errno from parse_loose_ref_contents
  - refs: add failure_errno to refs_read_raw_ref() signature
@@ -925,25 +1070,7 @@ Release tarballs are available at:
  Futz with the way 'errno' is relied on in the refs API to carry the
  failure modes up the callchain.
 
- Expecting a (hopefully final) reroll.
-
-
-* ab/cmd-foo-should-return (2021-06-09) 1 commit
-  (merged to 'next' on 2021-07-02 at 4f91c90007)
- + builtins + test helpers: use return instead of exit() in cmd_*
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* ab/progress-cleanup (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at 288570c95a)
- + read-cache.c: don't guard calls to progress.c API
-
- Code clean-up.
-
- Will merge to 'master'.
+ Will merge to 'next'.
 
 
 * ab/test-tool-cache-cleanup (2021-06-08) 4 commits
@@ -957,61 +1084,6 @@ Release tarballs are available at:
  Waiting for reviews.
 
 
-* ab/xdiff-bug-cleanup (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at f4920ba6d1)
- + xdiff: use BUG(...), not xdl_bug(...)
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* ar/test-code-cleanup (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at 12d23f8a42)
- + t: fix whitespace around &&
-
- Test code clean-up.
-
- Will merge to 'master'.
-
-
-* ba/object-info (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at c7fb4f900e)
- + protocol-caps.h: add newline at end of file
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* dd/document-log-decorate-default (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at 529d71a690)
- + doc/log: correct default for --decorate
-
- Doc clean-up.
-
- Will merge to 'master'.
-
-
-* fc/doc-default-to-upstream-config (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-01 at 3ce7d14f26)
- + doc: merge: mention default of defaulttoupstream
-
- Doc clean-up.
-
- Will merge to 'master'.
-
-
-* ms/mergetools-kdiff3-on-windows (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-02 at 5ca2515f34)
- + mergetools/kdiff3: make kdiff3 work on Windows too
-
- On Windows, mergetool has been taught to find kdiff3.exe just like
- it finds winmerge.exe.
-
- Will merge to 'master'.
-
-
 * ab/pack-objects-stdin (2021-06-28) 4 commits
  - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
  - pack-objects.c: do stdin parsing via revision.c's API
@@ -1021,47 +1093,37 @@ Release tarballs are available at:
  Code clean-up.
 
 
-* ar/doc-libera-chat-in-my-first-contrib (2021-06-09) 1 commit
-  (merged to 'next' on 2021-07-02 at a0e3a1f5f2)
- + MyFirstContribution: link #git-devel to Libera Chat
-
- Update MyFirst document.
-
- Will merge to 'master'.
-
-
-* ar/mailinfo-memcmp-to-skip-prefix (2021-06-09) 1 commit
-  (merged to 'next' on 2021-07-02 at e5122960c0)
- + mailinfo: use starts_with() when checking scissors
-
- Code clean-up.
-
- Will merge to 'master'.
-
-
-* ar/submodule-add (2021-06-16) 3 commits
- - submodule--helper: introduce add-config subcommand
+* ar/submodule-add (2021-07-08) 4 commits
  - submodule--helper: introduce add-clone subcommand
  - submodule--helper: refactor module_clone()
+ - submodule: prefix die messages with 'fatal'
+ - t7400: test failure to add submodule in tracked path
 
  Rewrite of "git submodule" in C continues.
 
- Waiting for reviews.
+ Will merge to 'next'.
 
 
-* ds/gender-neutral-doc (2021-06-16) 5 commits
- - SQUASH??? replace neutering tips with that of Æver
- - CodingGuidelines: recommend singular they
+* ds/gender-neutral-doc (2021-06-16) 3 commits
  - *: fix typos
  - comments: avoid using the gender of our users
  - doc: avoid using the gender of other people
+ (this branch is used by ds/gender-neutral-doc-guidelines.)
 
- Attempt to update the documentation not to assume users are of
- certain gender and adds to guidelines to do so.
+ Update the documentation not to assume users are of certain gender
+ and adds to guidelines to do so.
+
+ Will merge to 'next'.
 
- Will wait for conclusion of the on-list discussion.
- It appears that the updates to the text are favourably accepted by
- reviewers, but not necessarily the update to the guidelines.
+
+* ds/gender-neutral-doc-guidelines (2021-06-16) 2 commits
+ - SQUASH??? replace neutering tips with that of Æver
+ - CodingGuidelines: recommend singular they
+ (this branch uses ds/gender-neutral-doc.)
+
+ Attempt to give a guideline for gender neutral documentation. 
+
+ Comments?
 
 
 * gh/gitweb-branch-sort (2021-06-10) 1 commit
@@ -1073,15 +1135,6 @@ Release tarballs are available at:
  Waiting for reviews.
 
 
-* jk/doc-max-pack-size (2021-06-09) 1 commit
-  (merged to 'next' on 2021-07-02 at b272fddb22)
- + doc: warn people against --max-pack-size
-
- Doc update.
-
- Will merge to 'master'.
-
-
 * lh/systemd-timers (2021-07-02) 3 commits
  - maintenance: add support for systemd timers on Linux
  - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
@@ -1093,17 +1146,6 @@ Release tarballs are available at:
  Waiting for reviews.
 
 
-* dd/svn-test-wo-locale-a (2021-06-08) 1 commit
-  (merged to 'next' on 2021-07-01 at 9fa432af22)
- + t: use user-specified utf-8 locale for testing svn
-
- "git-svn" tests assumed that "locale -a", which is used to pick an
- available UTF-8 locale, is available everywhere.  A knob has been
- introduced to allow testers to specify a suitable locale to use.
-
- Will merge to 'master'.
-
-
 * fc/completion-updates (2021-06-07) 4 commits
  - completion: bash: add correct suffix in variables
  - completion: bash: fix for multiple dash commands
@@ -1117,13 +1159,14 @@ Release tarballs are available at:
 
 
 * mr/cmake (2021-06-11) 3 commits
- - cmake: add warning for ignored MSGFMT_EXE
- - cmake: create compile_commands.json by default
- - cmake: add knob to disable vcpkg
+  (merged to 'next' on 2021-07-06 at efc86eb8fb)
+ + cmake: add warning for ignored MSGFMT_EXE
+ + cmake: create compile_commands.json by default
+ + cmake: add knob to disable vcpkg
 
  CMake update.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/update-submitting-patches (2021-06-08) 3 commits
@@ -1139,50 +1182,33 @@ Release tarballs are available at:
 
 
 * hn/prep-tests-for-reftable (2021-06-02) 22 commits
- - t1415: set REFFILES for test specific to storage format
- - t4202: mark bogus head hash test with REFFILES
- - t7003: check reflog existence only for REFFILES
- - t7900: stop checking for loose refs
- - t1404: mark tests that muck with .git directly as REFFILES.
- - t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
- - t1414: mark corruption test with REFFILES
- - t1407: require REFFILES for for_each_reflog test
- - test-lib: provide test prereq REFFILES
- - t5304: use "reflog expire --all" to clear the reflog
- - t5304: restyle: trim empty lines, drop ':' before >
- - t7003: use rev-parse rather than FS inspection
- - t5000: inspect HEAD using git-rev-parse
- - t5000: reformat indentation to the latest fashion
- - t1301: fix typo in error message
- - t1413: use tar to save and restore entire .git directory
- - t1401-symbolic-ref: avoid direct filesystem access
- - t1401: use tar to snapshot and restore repo state
- - t5601: read HEAD using rev-parse
- - t9300: check ref existence using test-helper rather than a file system check
- - t/helper/ref-store: initialize oid in resolve-ref
- - t4202: split testcase for invalid HEAD symref and HEAD hash
+  (merged to 'next' on 2021-07-06 at 0d6f79d079)
+ + t1415: set REFFILES for test specific to storage format
+ + t4202: mark bogus head hash test with REFFILES
+ + t7003: check reflog existence only for REFFILES
+ + t7900: stop checking for loose refs
+ + t1404: mark tests that muck with .git directly as REFFILES.
+ + t2017: mark --orphan/logAllRefUpdates=false test as REFFILES
+ + t1414: mark corruption test with REFFILES
+ + t1407: require REFFILES for for_each_reflog test
+ + test-lib: provide test prereq REFFILES
+ + t5304: use "reflog expire --all" to clear the reflog
+ + t5304: restyle: trim empty lines, drop ':' before >
+ + t7003: use rev-parse rather than FS inspection
+ + t5000: inspect HEAD using git-rev-parse
+ + t5000: reformat indentation to the latest fashion
+ + t1301: fix typo in error message
+ + t1413: use tar to save and restore entire .git directory
+ + t1401-symbolic-ref: avoid direct filesystem access
+ + t1401: use tar to snapshot and restore repo state
+ + t5601: read HEAD using rev-parse
+ + t9300: check ref existence using test-helper rather than a file system check
+ + t/helper/ref-store: initialize oid in resolve-ref
+ + t4202: split testcase for invalid HEAD symref and HEAD hash
 
  Preliminary clean-up of tests before the main reftable changes
  hits the codebase.
 
- Will merge to 'next'.
-
-
-* js/trace2-discard-event-docfix (2021-06-04) 1 commit
-  (merged to 'next' on 2021-07-01 at 9fc3c6285e)
- + docs: fix api-trace2 doc for "too_many_files" event
-
- Docfix.
-
- Will merge to 'master'.
-
-
-* tk/partial-clone-repack-doc (2021-06-04) 1 commit
-  (merged to 'next' on 2021-07-01 at fe4c6280bc)
- + Remove warning that repack only works on non-promisor packfiles
-
- Docfix.
-
  Will merge to 'master'.
 
 
@@ -1199,60 +1225,53 @@ Release tarballs are available at:
 
 
 * fc/push-simple-updates (2021-06-02) 7 commits
- - doc: push: explain default=simple correctly
- - push: remove unused code in setup_push_upstream()
- - push: simplify setup_push_simple()
- - push: reorganize setup_push_simple()
- - push: copy code to setup_push_simple()
- - push: hedge code of default=simple
- - push: rename !triangular to same_remote
+  (merged to 'next' on 2021-07-06 at 95c114f930)
+ + doc: push: explain default=simple correctly
+ + push: remove unused code in setup_push_upstream()
+ + push: simplify setup_push_simple()
+ + push: reorganize setup_push_simple()
+ + push: copy code to setup_push_simple()
+ + push: hedge code of default=simple
+ + push: rename !triangular to same_remote
  (this branch is used by fc/push-simple-updates-cleanup.)
 
  Some code and doc clarification around "git push".
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * fc/push-simple-updates-cleanup (2021-06-02) 13 commits
- - push: don't get a full remote object
- - push: only check same_remote when needed
- - push: remove trivial function
- - push: remove redundant check
- - push: factor out the typical case
- - push: get rid of all the setup_push_* functions
- - push: trivial simplifications
- - push: make setup_push_* return the dst
- - push: only get the branch when needed
- - push: factor out null branch check
- - push: split switch cases
- - push: return immediately in trivial switch case
- - push: create new get_upstream_ref() helper
+  (merged to 'next' on 2021-07-06 at da7fab5dc4)
+ + push: don't get a full remote object
+ + push: only check same_remote when needed
+ + push: remove trivial function
+ + push: remove redundant check
+ + push: factor out the typical case
+ + push: get rid of all the setup_push_* functions
+ + push: trivial simplifications
+ + push: make setup_push_* return the dst
+ + push: only get the branch when needed
+ + push: factor out null branch check
+ + push: split switch cases
+ + push: return immediately in trivial switch case
+ + push: create new get_upstream_ref() helper
  (this branch uses fc/push-simple-updates.)
 
  Some more code and doc clarification around "git push".
 
- Will merge to 'next'.
-
-
-* tb/complete-diff-anchored (2021-05-31) 1 commit
-  (merged to 'next' on 2021-07-01 at 19878daaa9)
- + completion: add --anchored to diff's options
-
- The command line completion (in contrib/) learned that "git diff"
- takes the "--anchored" option.
-
  Will merge to 'master'.
 
 
 * en/ort-perf-batch-12 (2021-06-09) 4 commits
- - merge-ort: miscellaneous touch-ups
- - Fix various issues found in comments
- - diffcore-rename: avoid unnecessary strdup'ing in break_idx
- - merge-ort: replace string_list_df_name_compare with faster alternative
+  (merged to 'next' on 2021-07-08 at 4807694598)
+ + merge-ort: miscellaneous touch-ups
+ + Fix various issues found in comments
+ + diffcore-rename: avoid unnecessary strdup'ing in break_idx
+ + merge-ort: replace string_list_df_name_compare with faster alternative
 
  More fix-ups and optimization to "merge -sort".
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * zh/ref-filter-raw-data (2021-07-01) 16 commits
@@ -1278,6 +1297,7 @@ Release tarballs are available at:
  option of "git for-each-ref" and its friends to be used in "git
  cat-file --batch".
 
+ Heavy performance degradation has been observed with this series.
 
 
 * jh/builtin-fsmonitor (2021-07-01) 34 commits
@@ -1328,27 +1348,29 @@ Release tarballs are available at:
  trace2 logs learned to show parent process name to see in what
  context Git was invoked.
 
- Will merge to 'next'?
+ Expecting a reroll.
+ cf. <YNux62he9Mk43Y1B@google.com>
 
 
 * ab/send-email-optim (2021-05-28) 13 commits
- - perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
- - send-email: move trivial config handling to Perl
- - perl: lazily load some common Git.pm setup code
- - send-email: lazily load modules for a big speedup
- - send-email: get rid of indirect object syntax
- - send-email: use function syntax instead of barewords
- - send-email: lazily shell out to "git var"
- - send-email: lazily load config for a big speedup
- - send-email: copy "config_regxp" into git-send-email.perl
- - send-email: refactor sendemail.smtpencryption config parsing
- - send-email: remove non-working support for "sendemail.smtpssl"
- - send-email tests: test for boolean variables without a value
- - send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
+  (merged to 'next' on 2021-07-08 at 35ac315894)
+ + perl: nano-optimize by replacing Cwd::cwd() with Cwd::getcwd()
+ + send-email: move trivial config handling to Perl
+ + perl: lazily load some common Git.pm setup code
+ + send-email: lazily load modules for a big speedup
+ + send-email: get rid of indirect object syntax
+ + send-email: use function syntax instead of barewords
+ + send-email: lazily shell out to "git var"
+ + send-email: lazily load config for a big speedup
+ + send-email: copy "config_regxp" into git-send-email.perl
+ + send-email: refactor sendemail.smtpencryption config parsing
+ + send-email: remove non-working support for "sendemail.smtpssl"
+ + send-email tests: test for boolean variables without a value
+ + send-email tests: support GIT_TEST_PERL_FATAL_WARNINGS=true
 
  "git send-email" optimization.
 
- Will merge to 'next'.
+ Will merge to 'master'.
 
 
 * ab/fsck-unexpected-type (2021-06-28) 21 commits
@@ -1377,141 +1399,4 @@ Release tarballs are available at:
  "git fsck" has been taught to report mismatch between expected and
  actual types of an object better.
 
---------------------------------------------------
-[Will Discard]
-
-* ag/merge-strategies-in-c (2021-03-17) 15 commits
- . sequencer: use the "octopus" merge strategy without forking
- . sequencer: use the "resolve" strategy without forking
- . merge: use the "octopus" strategy without forking
- . merge: use the "resolve" strategy without forking
- . merge-octopus: rewrite in C
- . merge-recursive: move better_branch_name() to merge.c
- . merge-resolve: rewrite in C
- . merge-one-file: rewrite in C
- . update-index: move add_cacheinfo() to read-cache.c
- . merge-index: add a new way to invoke `git-merge-one-file'
- . merge-index: drop the index
- . merge-index: libify merge_one_path() and merge_all()
- . t6060: add tests for removed files
- . t6060: modify multiple files to expose a possible issue with merge-index
- . t6407: modernise tests
-
- The resolve and octopus merge strategy backends have been rewritten
- in C.
-
- Will discard.
- We had to wait for a reroll for too long.
- cf. <nycvar.QRO.7.76.6.2103241142220.50@tvgsbejvaqbjf.bet>
-
-
-* mr/bisect-in-c-4 (2021-04-11) 4 commits
- . bisect--helper: retire `--bisect-next-check` subcommand
- . bisect--helper: reimplement `bisect_run` shell function in C
- . bisect--helper: reimplement `bisect_visualize()`shell function in C
- . run-command: make `exists_in_PATH()` non-static
-
- The codepaths involved in running "git bisect visualize" and "git
- bisect run" has been rewritten in C.
-
- Will discard.
- We had to wait for a reroll for too long.
- cf. <xmqq35vwh8qk.fsf@gitster.g>, <xmqqy2doftrj.fsf@gitster.g>,
- <CAP8UFD3X24F3qgefHpi00PM-KUk+vcqxwy2Dbngbyj7ciavCVQ@mail.gmail.com>
- May want to boost the test coverage.
-
-
-* ma/t0091-bugreport-fix (2021-04-12) 1 commit
- . t0091-bugreport.sh: actually verify some content of report
-
- Test fix.
-
- Will discard.
- We had to wait for a reroll for too long.
- Expecting a reroll.
- cf. <YHYZTLl90rkWWVOr@google.com>, <87a6q22dei.fsf@evledraar.gmail.com>
-
-
-* ls/fast-export-signed (2021-05-03) 5 commits
- . fast-export, fast-import: add support for signed-commits
- . fast-export: do not modify memory from get_commit_buffer
- . git-fast-export.txt: clarify why 'verbatim' may not be a good idea
- . fast-export: rename --signed-tags='warn' to 'warn-verbatim'
- . git-fast-import.txt: add missing LF in the BNF
-
- "git fast-export" offers a way to control how signed tags are
- handled; the mechanism has been extended to allow specifying how
- signed commits are handled as well.
-
- Will discard.
- We had to wait for a reroll for too long.
- cf. <xmqqa6pca0pv.fsf@gitster.g>, <xmqq1rao9zev.fsf@gitster.g>
-
-
-* fc/neuter-doc (2021-06-14) 2 commits
- . comments: avoid using the gender of our users
- . doc: avoid using the gender of other people
-
- An attempt to avoid gendered pronouns by rewriting parts of docs.
-
- This seems to give more readable result than Stolee's "use singular
- they" topic.
-
- Will discard.
- Now is a part of the ds/gender-neutral-doc topic.
-
-
-* es/config-based-hooks (2021-05-27) 37 commits
- . docs: link githooks and git-hook manpages
- . doc: clarify fsmonitor-watchman specification
- . run-command: stop thinking about hooks
- . git-send-email: use 'git hook run' for 'sendemail-validate'
- . bugreport: use hook_exists instead of find_hook
- . receive-pack: convert receive hooks to hook.h
- . post-update: use hook.h library
- . proc-receive: acquire hook list from hook.h
- . receive-pack: convert 'update' hook to hook.h
- . reference-transaction: look for hooks in config
- . transport: convert pre-push hook to use config
- . hook: convert 'post-rewrite' hook to config
- . hooks: convert 'post-checkout' hook to hook library
- . git-p4: use 'git hook' to run hooks
- . receive-pack: convert push-to-checkout hook to hook.h
- . read-cache: convert post-index-change hook to use config
- . rebase: teach pre-rebase to use hook.h
- . gc: use hook library for pre-auto-gc hook
- . merge: use config-based hooks for post-merge hook
- . am: convert applypatch hooks to use config
- . commit: use config-based hooks
- . hooks: allow callers to capture output
- . run-command: allow capturing of collated output
- . hook: provide stdin by string_list or callback
- . run-command: add stdin callback for parallelization
- . hook: allow specifying working directory for hooks
- . hook: allow parallel hook execution
- . run-command: allow stdin for run_processes_parallel
- . hook: support passing stdin to hooks
- . hook: introduce hook_exists()
- . hook: add 'run' subcommand
- . parse-options: parse into strvec
- . hook: implement hookcmd.<name>.skip
- . hook: teach hook.runHookDir
- . hook: include hookdir hook in list
- . hook: introduce git-hook subcommand
- . doc: propose hooks managed by the config
-
- Propose hook scripts defined in the configuration.
-
- Will discard.
- ab/config-based-hooks-base refactors the preparatory part so that
- the new feature in this topic can be rebased on top.
-
-
-* bc/doc-asciidoctor-to-man-wo-xmlto (2021-05-14) 2 commits
- . doc: remove GNU_ROFF option
- . doc: add an option to have Asciidoctor build man pages directly
-
- An option to render the manual pages via AsciiDoctor bypassing
- xmlto has been introduced.
-
- Will discard.
+ Needs review.