What's cooking in git.git (Dec 2021, #03; Fri, 10)

What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Junio C Hamano]

Here are the topics that have been cooking in my tree.  Commits
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'.  The ones marked with '.' do not appear in any of the
integration branches, but I am still holding onto them.

Quite a few topics are now in 'master' as part of the second batch.

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
repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-vcs/git/

With all the integration branches and topics broken out:

	https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

	https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[Graduated to 'master']

* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit
  (merged to 'next' on 2021-12-02 at 5922388782)
 + checkout: fix "branch info" memory leaks

 Leakfix.
 source: <patch-v4-1.1-57bcd0cbc23-20211116T182604Z-avarab@gmail.com>


* ab/generate-command-list (2021-11-05) 10 commits
  (merged to 'next' on 2021-12-02 at 37a575b37f)
 + generate-cmdlist.sh: don't parse command-list.txt thrice
 + generate-cmdlist.sh: replace "grep' invocation with a shell version
 + generate-cmdlist.sh: do not shell out to "sed"
 + generate-cmdlist.sh: stop sorting category lines
 + generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
 + generate-cmdlist.sh: run "grep | sort", not "sort | grep"
 + generate-cmdlist.sh: don't call get_categories() from category_list()
 + generate-cmdlist.sh: spawn fewer processes
 + generate-cmdlist.sh: trivial whitespace change
 + command-list.txt: sort with "LC_ALL=C sort"

 Build optimization.
 source: <cover-v3-00.10-00000000000-20211105T135058Z-avarab@gmail.com>


* ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit
  (merged to 'next' on 2021-12-02 at 1b49913760)
 + pull: don't say that merge is "the default strategy"

 The advice message given by "git pull" when the user hasn't made a
 choice between merge and rebase still said that the merge is the
 default, which no longer is the case.  This has been corrected.
 source: <20211118154317.639118-1-alexhenrie24@gmail.com>


* bc/require-c99 (2021-12-01) 1 commit
  (merged to 'next' on 2021-12-02 at 76aa8bc2d0)
 + git-compat-util: add a test balloon for C99 support
 (this branch is used by jk/limit-developers-to-gnu99.)

 Weather balloon to break people with compilers that do not support
 C99.
 source: <20211201014050.38002-1-sandals@crustytoothpaste.net>


* cb/add-p-single-key-fix (2021-11-28) 1 commit
  (merged to 'next' on 2021-12-03 at 8d4f16e620)
 + add -p: avoid use of undefined $key when ReadKey -> EOF

 The single-key-input mode in "git add -p" had some code to handle
 keys that generate a sequence of input via ReadKey(), which did not
 handle end-of-file correctly, which has been fixed.
 source: <20211128174903.5623-1-carenas@gmail.com>


* cb/mingw-gmtime-r (2021-11-27) 1 commit
  (merged to 'next' on 2021-12-03 at 785278d40e)
 + mingw: avoid fallback for {local,gm}time_r()

 Build fix on Windows.
 source: <pull.1142.v2.git.git.1638008132992.gitgitgadget@gmail.com>


* cw/protocol-v2-doc-fix (2021-11-11) 1 commit
  (merged to 'next' on 2021-12-02 at 59f42a7cfc)
 + protocol-v2.txt: align delim-pkt spec with usage

 Doc update.
 source: <20211111220048.1702896-1-calvinwan@google.com>


* em/missing-pager (2021-11-24) 1 commit
  (merged to 'next' on 2021-12-03 at 22ad721b52)
 + pager: fix crash when pager program doesn't exist

 When a non-existent program is given as the pager, we tried to
 reuse an uninitialized child_process structure and crashed, which
 has been fixed.
 source: <20211125000239.2336-1-ematsumiya@suse.de>


* en/rebase-x-fix (2021-11-29) 1 commit
  (merged to 'next' on 2021-12-03 at a833829733)
 + sequencer: avoid adding exec commands for non-commit creating commands

 "git rebase -x" added an unnecessary 'exec' instructions before
 'noop', which has been corrected.
 source: <pull.1149.git.git.1638244719381.gitgitgadget@gmail.com>


* gc/remote-with-fewer-static-global-variables (2021-11-18) 5 commits
  (merged to 'next' on 2021-12-02 at d7ea1696e5)
 + remote: die if branch is not found in repository
 + remote: remove the_repository->remote_state from static methods
 + remote: use remote_state parameter internally
 + remote: move static variables into per-repository struct
 + t5516: add test case for pushing remote refspecs

 Code clean-up to eventually allow information on remotes defined
 for an arbitrary repository to be read.
 source: <20211118005325.64971-1-chooglen@google.com>


* hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit
  (merged to 'next' on 2021-12-02 at 971178fe99)
 + ci(check-whitespace): update stale file top comments

 Comment fix.
 source: <pull.1143.git.git.1637347813367.gitgitgadget@gmail.com>


* hn/create-reflog-simplify (2021-11-22) 1 commit
  (merged to 'next' on 2021-12-02 at 87ff49b776)
 + refs: drop force_create argument of create_reflog API
 (this branch is used by hn/reftable-coverity-fixes.)

 A small simplification of API.
 source: <pull.1144.git.git.1637590749342.gitgitgadget@gmail.com>


* if/redact-packfile-uri (2021-11-11) 2 commits
  (merged to 'next' on 2021-12-02 at 81213be9ac)
 + http-fetch: redact url on die() message
 + fetch-pack: redact packfile urls in traces

 Redact the path part of packfile URI that appears in the trace output.
 source: <pull.1052.v7.git.1636588289.gitgitgadget@gmail.com>


* ja/doc-cleanup (2021-11-09) 10 commits
  (merged to 'next' on 2021-12-02 at f72204942f)
 + init doc: --shared=0xxx does not give umask but perm bits
 + doc: git-init: clarify file modes in octal.
 + doc: git-http-push: describe the refs as pattern pairs
 + doc: uniformize <URL> placeholders' case
 + doc: use three dots for indicating repetition instead of star
 + doc: git-ls-files: express options as optional alternatives
 + doc: use only hyphens as word separators in placeholders
 + doc: express grammar placeholders between angle brackets
 + doc: split placeholders as individual tokens
 + doc: fix git credential synopsis

 Doc update.
 source: <20211106184858.11500-1-jn.avila@free.fr>


* jc/fix-first-object-walk (2021-10-29) 2 commits
  (merged to 'next' on 2021-12-02 at 43a5c1ec03)
 + docs: add headers in MyFirstObjectWalk
 + docs: fix places that break compilation in MyFirstObjectWalk

 Doc update.
 source: <pull.1063.v3.git.1635537163.gitgitgadget@gmail.com>


* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit
  (merged to 'next' on 2021-12-02 at e2cc1ae46a)
 + fetch-pack: ignore SIGPIPE when writing to index-pack

 "git fetch", when received a bad packfile, can fail with SIGPIPE.
 This wasn't wrong per-se, but we now detect the situation and fail
 in a more predictable way.
 source: <YZgQD3lrw4+i4EMd@coredump.intra.peff.net>


* jk/jump-merge-with-pathspec (2021-11-09) 1 commit
  (merged to 'next' on 2021-12-02 at fea901973d)
 + git-jump: pass "merge" arguments to ls-files

 The "merge" subcommand of "git jump" (in contrib/) silently ignored
 pathspec and other parameters.
 source: <YYqjY/zcBWyqY8/5@coredump.intra.peff.net>


* jk/refs-g11-workaround (2021-11-19) 1 commit
  (merged to 'next' on 2021-12-02 at 1025235670)
 + refs: work around gcc-11 warning with REF_HAVE_NEW

 Workaround for a false-alarm by gcc-11
 source: <YZgW/pz6CbpaywDa@coredump.intra.peff.net>


* jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit
  (merged to 'next' on 2021-12-02 at d0b158d899)
 + strbuf_addftime(): handle "%s" manually

 The "--date=format:<strftime>" gained a workaround for the lack of
 system support for a non-local timezone to handle "%s" placeholder.
 source: <YYEihoLbEGi44dDb@coredump.intra.peff.net>


* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit
  (merged to 'next' on 2021-12-02 at 0ac4fd64aa)
 + t5319: corrupt more bytes of the midx checksum

 Test fix.
 source: <YZQk6t1veegeAlYh@coredump.intra.peff.net>


* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits
  (merged to 'next' on 2021-12-02 at eefd61931f)
 + t7006: simplify exit-code checks for sigpipe tests
 + t7006: clean up SIGPIPE handling in trace2 tests
 + run-command: unify signal and regular logic for wait_or_whine()

 The function to cull a child process and determine the exit status
 had two separate code paths for normal callers and callers in a
 signal handler, and the latter did not yield correct value when the
 child has caught a signal.  The handling of the exit status has
 been unified for these two code paths.  An existing test with
 flakiness has also been corrected.
 source: <YZrSALOrdhuunHwp@coredump.intra.peff.net>


* jk/test-bitmap-fix (2021-11-05) 1 commit
  (merged to 'next' on 2021-12-02 at c273d402fb)
 + test_bitmap_hashes(): handle repository without bitmaps

 Tighten code for testing pack-bitmap.
 source: <YYTy6+DG5guzJIO7@coredump.intra.peff.net>


* js/ci-no-directional-formatting (2021-11-04) 1 commit
  (merged to 'next' on 2021-12-02 at bc756bc586)
 + ci: disallow directional formatting

 CI has been taught to catch some Unicode directional formatting
 sequence that can be used in certain mischief.
 source: <pull.1071.v3.git.1636031609982.gitgitgadget@gmail.com>


* js/trace2-avoid-recursive-errors (2021-11-18) 1 commit
  (merged to 'next' on 2021-12-02 at c5b1e5ddec)
 + trace2: disable tr2_dst before warning on write errors

 trace2 error code path fix.
 source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>


* jt/midx-doc-fix (2021-11-22) 1 commit
  (merged to 'next' on 2021-12-02 at eac9f263ae)
 + Doc: no midx and partial clone relation

 Docfix.
 source: <20211122184114.3328662-1-jonathantanmy@google.com>


* jt/pack-header-lshift-overflow (2021-11-11) 1 commit
  (merged to 'next' on 2021-12-02 at 89c37479db)
 + packfile: avoid overflowing shift during decode

 The code to decode the length of packed object size has been
 corrected.
 source: <20211110234033.3144165-1-jonathantanmy@google.com>


* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit
  (merged to 'next' on 2021-12-03 at afc462a692)
 + submodule: absorb git dir instead of dying on deinit

 "git submodule deinit" for a submodule whose .git metadata
 directory is embedded in its working tree refused to work, until
 the submodule gets converted to use the "absorbed" form where the
 metadata directory is stored in superproject, and a gitfile at the
 top-level of the working tree of the submodule points at it.  The
 command is taught to convert such submodules to the absorbed form
 as needed.
 source: <pull.1078.v7.git.git.1637319387717.gitgitgadget@gmail.com>


* po/size-t-for-vs (2021-12-01) 3 commits
  (merged to 'next' on 2021-12-02 at 489c5b0046)
 + object-file.c: LLP64 compatibility, upcast unity for left shift
 + diffcore-delta.c: LLP64 compatibility, upcast unity for left shift
 + repack.c: LLP64 compatibility, upcast unity for left shift

 On platforms where ulong is shorter than size_t, code paths that
 shifted 1 or 1U to the left lacked the necessary cast to size_t,
 which have been corrected.
 source: <20211201002902.1042-4-philipoakley@iee.email>


* rs/mergesort (2021-11-18) 1 commit
  (merged to 'next' on 2021-12-02 at 0490b0ffbd)
 + mergesort: avoid left shift overflow

 Bitop fix for platforms whose "long" is 32-bit.
 source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>


* tl/midx-docfix (2021-11-18) 1 commit
  (merged to 'next' on 2021-12-02 at 0fae3ebdef)
 + midx: fix a formatting issue in "multi-pack-index.txt"

 Doc mark-up fix.
 source: <9b910a44f4143c94787110a688f2b17ba4eeb0fc.1637218943.git.dyroneteng@gmail.com>


* tw/var-default-branch (2021-11-03) 1 commit
  (merged to 'next' on 2021-12-02 at 944512852e)
 + var: add GIT_DEFAULT_BRANCH variable

 "git var GIT_DEFAULT_BRANCH" is a way to see what name is used for
 the newly created branch if "git init" is run.
 source: <20211103201702.117771-1-thomas@t-8ch.de>


* vd/sparse-reset (2021-11-29) 8 commits
  (merged to 'next' on 2021-12-02 at 47b1095f39)
 + unpack-trees: improve performance of next_cache_entry
 + reset: make --mixed sparse-aware
 + reset: make sparse-aware (except --mixed)
 + reset: integrate with sparse index
 + reset: expand test coverage for sparse checkouts
 + sparse-index: update command for expand/collapse test
 + reset: preserve skip-worktree bit in mixed reset
 + reset: rename is_missing to !is_in_reset_tree
 (this branch is used by ds/fetch-pull-with-sparse-index and ld/sparse-diff-blame.)

 Various operating modes of "git reset" have been made to work
 better with the sparse index.
 source: <pull.1048.v6.git.1638201164.gitgitgadget@gmail.com>


* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits
  (merged to 'next' on 2021-12-02 at 1ec68669cb)
 + sparse-index: update do_read_index to ensure correct sparsity
 + sparse-index: add ensure_correct_sparsity function
 + sparse-index: avoid unnecessary cache tree clearing
 + test-read-cache.c: prepare_repo_settings after config init

 Ensure that the sparseness of the in-core index matches the
 index.sparse configuration specified by the repository immediately
 after the on-disk index file is read.
 source: <pull.1059.v5.git.1637626833.gitgitgadget@gmail.com>


* yn/complete-date-format-options (2021-11-25) 1 commit
  (merged to 'next' on 2021-12-03 at 4f37a904a1)
 + completion: add human and auto: date format

 The completion script (in contrib/) learns that the "--date"
 option of commands from the "git log" family takes "human" and
 "auto" as valid values.
 source: <pull.1083.git.1637666875171.gitgitgadget@gmail.com>

--------------------------------------------------
[New Topics]

* en/sparse-checkout-set (2021-12-08) 10 commits
 - clone: avoid using deprecated `sparse-checkout init`
 - Documentation: clarify/correct a few sparsity related statements
 - git-sparse-checkout.txt: update to document init/set/reapply changes
 - sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}
 - sparse-checkout: enable `set` to initialize sparse-checkout mode
 - sparse-checkout: split out code for tweaking settings config
 - sparse-checkout: disallow --no-stdin as an argument to set
 - sparse-checkout: add sanity-checks on initial sparsity state
 - sparse-checkout: break apart functions for sparse_checkout_(set|add)
 - sparse-checkout: pass use_stdin as a parameter instead of as a global

 
 The "init" and "set" subcommands in "git sparse-checkout" have been
 unified for a better user experience and performance.

 Need to check the reroll.
 cf. <pull.1151.v3.git.git.1639108573.gitgitgadget@gmail.com>
 source: <pull.1151.v2.git.git.1638908410.gitgitgadget@gmail.com>


* hn/reftable-coverity-fixes (2021-12-08) 13 commits
 - reftable: make reftable_record a tagged union
 - reftable: handle null refnames in reftable_ref_record_equal
 - reftable: drop stray printf in readwrite_test
 - reftable: order unittests by complexity
 - reftable: fix NULL derefs in error paths
 - reftable: fix resource warning
 - reftable: ignore remove() return value in stack_test.c
 - reftable: check reftable_stack_auto_compact() return value
 - reftable: fix resource leak blocksource.c
 - reftable: fix resource leak in error path
 - reftable: fix OOB stack write in print functions
 - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes
 - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes
 (this branch uses hn/reftable.)

 Problems identified by Coverity in the reftable code have been
 corrected.

 source: <pull.1152.v2.git.git.1639000187.gitgitgadget@gmail.com>


* jc/make-test-all (2021-12-08) 1 commit
 - Makefile: add test-all target

 "make test" target in subdirectories of contrib/ are now exercised
 in CI tests.

 source: <xmqqh7bi27o9.fsf@gitster.g>


* jk/limit-developers-to-gnu99 (2021-12-08) 2 commits
 - config.mak.dev: specify -std=gnu99 for gcc/clang
 - Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99

 Enable -std=gnu99 option in DEVELOPER builds.

 Will merge to 'next'.
 source: <YbEMnksMEuAz3Nt0@coredump.intra.peff.net>


* tb/midx-bitmap-corruption-fix (2021-12-08) 2 commits
 - midx.c: make changing the preferred pack safe
 - t5326: demonstrate bitmap corruption after permutation

 A bug that made multi-pack bitmap and the object order out-of-sync
 (hence the .midx data gets corrupted) has been fixed.

 Will merge to 'next'?
 source: <cover.1638991570.git.me@ttaylorr.com>


* es/test-chain-lint (2021-12-09) 19 commits
 - t6000-t9999: detect and signal failure within loop
 - t5000-t5999: detect and signal failure within loop
 - t4000-t4999: detect and signal failure within loop
 - t0000-t3999: detect and signal failure within loop
 - tests: simplify by dropping unnecessary `for` loops
 - tests: apply modern idiom for exiting loop upon failure
 - tests: apply modern idiom for signaling test failure
 - tests: fix broken &&-chains in `{...}` groups
 - tests: fix broken &&-chains in `$(...)` command substitutions
 - tests: fix broken &&-chains in compound statements
 - tests: use test_write_lines() to generate line-oriented output
 - tests: simplify construction of large blocks of text
 - t9107: use shell parameter expansion to avoid breaking &&-chain
 - t6300: make `%(raw:size) --shell` test more robust
 - t5516: drop unnecessary subshell and command invocation
 - t4202: clarify intent by creating expected content less cleverly
 - t1020: avoid aborting entire test script when one test fails
 - t1010: fix unnoticed failure on Windows
 - t/lib-pager: use sane_unset() to avoid breaking &&-chain

 Broken &&-chains in the test scripts have been corrected.

 Will merge to 'next'?
 source: <20211209051115.52629-1-sunshine@sunshineco.com>


* jc/flex-array-definition (2021-12-08) 1 commit
 - flex-array: simplify compiler-specific workaround

 The conditions to choose different definitions of the FLEX_ARRAY
 macro for vendor compilers has been simplified to make it easier to
 maintain.

 Will merge to 'next'?
 source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>


* jh/make-p4-python3-only (2021-12-09) 6 commits
 - git-p4: Resolve RCS keywords in binary
 - git-p4: Eliminate decode_stream and encode_stream
 - git-p4: Decode byte strings before printing
 - git-p4: Removed support for Python 2
 - git-p4: Don't print shell commands as python lists
 - git-p4: Always pass cmd arguments to subprocess as a python lists

 Support for Python2 in "git p4" has been removed (not just
 deprecated).

 Need to check the reroll.
 cf. <20211210153101.35433-1-jholdsworth@nvidia.com>
 source: <20211209201029.136886-1-jholdsworth@nvidia.com>

--------------------------------------------------
[Stalled]

* ar/submodule-update (2021-10-13) 9 commits
 . submodule--helper: rename helper functions
 . submodule--helper: remove unused helpers
 . submodule: move core cmd_update() logic to C
 . submodule--helper: run update using child process struct
 . submodule--helper: allow setting superprefix for init_submodule()
 . submodule--helper: refactor get_submodule_displaypath()
 . submodule--helper: rename helpers for update-clone
 . submodule--helper: get remote names from any repository
 . submodule--helper: split up ensure_core_worktree()

 Rewrite of "git submodule update" in C.

 Expecting a reroll?
 cf. <YWiXL+plA7GHfuVv@google.com>
 source: <20211013051805.45662-10-raykar.ath@gmail.com>


* ms/customizable-ident-expansion (2021-09-01) 1 commit
 - keyword expansion: make "$Id$" string configurable

 Instead of "$Id$", user-specified string (like $FreeBSD$) can be
 used as an in-blob placeholder for keyword expansion.

 Will discard.
 Stalled for too long.
 cf. <xmqqfsuosvrh.fsf@gitster.g>
 cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
 source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>

--------------------------------------------------
[Cooking]

* pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
 - rebase -m: don't fork git checkout
 - rebase --apply: set ORIG_HEAD correctly
 - rebase --apply: fix reflog
 - reset_head(): take struct rebase_head_opts
 - rebase: cleanup reset_head() calls
 - reset_head(): make default_reflog_action optional
 - reset_head(): factor out ref updates
 - create_autostash(): remove unneeded parameter
 - reset_head(): remove action parameter
 - rebase --apply: don't run post-checkout hook if there is an error
 - rebase: do not remove untracked files on checkout
 - rebase: pass correct arguments to post-checkout hook
 - t5403: refactor rebase post-checkout hook tests
 - rebase: factor out checkout for up to date branch

 Fix "some issues" in a helper function reset_head().
 source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>


* je/http-better-error-output (2021-12-03) 1 commit
 . http-backend: give a hint that web browser access is not supported

 When the http-backend program, which is the server-side component
 for the smart HTTP transport, sends a "404 Not found" error, we
 deliberately did not say anything to the requesting client.  We now
 send a message back to the browser to tell the user that they do
 not want to visit the URL via their browser, instead of a totally
 blank page.

 Expecting a reroll.
 Breaks its self tests.
 cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>
 source: <20211202102855.23907-1-jengelh@inai.de>


* es/doc-stdout-vs-stderr (2021-12-04) 1 commit
  (merged to 'next' on 2021-12-07 at d6487c1256)
 + CodingGuidelines: document which output goes to stdout vs. stderr

 Coding guideline document has been updated to clarify what goes to
 standard error i nour system.

 Will merge to 'master'.
 source: <20211202223110.22062-1-sunshine@sunshineco.com>


* tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit
  (merged to 'next' on 2021-12-07 at 912c270b70)
 + packfile: make `close_pack_revindex()` static

 Code clean-up.

 Will merge to 'master'.
 source: <dad2b73c84f1c1575a6bce04a449ee1236680b10.1638658219.git.me@ttaylorr.com>


* ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits
  (merged to 'next' on 2021-12-07 at 7b7f74216a)
 + unpack-trees: use traverse_path instead of name
 + t1092: add deeper changes during a checkout

 The sparse-index/sparse-checkout feature had a bug in its use of
 the matching code to determine which path is in or outside the
 sparse checkout patterns.

 Will merge to 'master'.
 source: <pull.1092.v2.git.1638799837.gitgitgadget@gmail.com>


* en/name-rev-shorter-output (2021-12-04) 1 commit
  (merged to 'next' on 2021-12-10 at ae8ec3912f)
 + name-rev: prefer shorter names over following merges

 "git name-rev" has been tweaked to give output that is shorter and
 easier to understand.

 Will merge to 'master'.
 source: <pull.1119.git.git.1636762454792.gitgitgadget@gmail.com>


* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit
  (merged to 'next' on 2021-12-07 at 44f2663314)
 + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'

 "git rebase -x" by mistake started exporting the GIT_DIR and
 GIT_WORK_TREE environment variables when the command was rewritten
 in C, which has been corrected.

 Will merge to 'master'.
 source: <pull.1134.v3.git.git.1638596219656.gitgitgadget@gmail.com>


* es/worktree-chatty-to-stderr (2021-12-04) 2 commits
  (merged to 'next' on 2021-12-07 at 84ba7de37c)
 + git-worktree.txt: add missing `-v` to synopsis for `worktree list`
 + worktree: send "chatty" messages to stderr

 "git worktree add" showed "Preparing worktree" message to the
 standard output stream, but when it failed, the message from die()
 went to the standard error stream.  Depending on the order the
 stdio streams are flushed at the program end, this resulted in
 confusing output.  It has been corrected by sending all the chatty
 messages to the standard error stream.

 Will merge to 'master'.
 source: <20211203034420.47447-1-sunshine@sunshineco.com>


* ja/i18n-similar-messages (2021-12-05) 10 commits
 - i18n: ref-filter: factorize "%(foo) atom used without %(bar) atom"
 - i18n: factorize "--foo outside a repository"
 - i18n: refactor "unrecognized %(foo) argument" strings
 - i18n: factorize "no directory given for --foo"
 - i18n: factorize "--foo requires --bar" and the like
 - i18n: tag.c factorize i18n strings
 - i18n: standardize "cannot open" and "cannot read"
 - i18n: turn "options are incompatible" into "are mutually exclusive"
 - i18n: refactor "%s, %s and %s are mutually exclusive"
 - i18n: refactor "foo and bar are mutually exclusive"

 Similar message templates have been consolidated so that
 translators need to work on fewer number of messages.

 Needs review.
 source: <pull.1088.git.1638514909.gitgitgadget@gmail.com>


* js/test-initial-branch-override-cleanup (2021-12-05) 1 commit
  (merged to 'next' on 2021-12-07 at 0ab3e72b4f)
 + tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed

 Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
 mechanism to force "git" to use 'master' as the default name for
 the initial branch no longer need it; the use of the mechanism from
 them have been removed.

 Will merge to 'master'.
 source: <pull.1089.git.1638524353230.gitgitgadget@gmail.com>


* ab/die-with-bug (2021-12-07) 4 commits
  (merged to 'next' on 2021-12-08 at 9b7440fafd)
 + object.c: use BUG(...) no die("BUG: ...") in lookup_object_by_type()
 + pathspec: use BUG(...) not die("BUG:%s:%d....", <file>, <line>)
 + strbuf.h: use BUG(...) not die("BUG: ...")
 + pack-objects: use BUG(...) not die("BUG: ...")

 Code clean-up.

 Will merge to 'master'.
 source: <cover-v2-0.4-00000000000-20211207T110440Z-avarab@gmail.com>


* ab/usage-die-message (2021-12-07) 6 commits
 - config API: use get_error_routine(), not vreportf()
 - usage.c + gc: add and use a die_message_errno()
 - gc: return from cmd_gc(), don't call exit()
 - usage.c API users: use die_message() for error() + exit 128
 - usage.c API users: use die_message() for "fatal :" + exit 128
 - usage.c: add a die_message() routine

 Code clean-up to hide vreportf() from public API.

 Needs review.
 source: <cover-v2-0.6-00000000000-20211207T182419Z-avarab@gmail.com>


* js/compat-util-msvc-flex-array (2021-12-06) 1 commit
 - git-compat-util(msvc): C11 does not imply support for zero-sized arrays

 MSVC build started to break on flex arrays?

 Will merge to 'next'?
 source: <pull.1094.git.1638823724410.gitgitgadget@gmail.com>


* ab/common-main-cleanup (2021-12-07) 1 commit
 - common-main.c: call exit(), don't return

 Code clean-up.

 Will merge to 'next'?
 source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@gmail.com>


* ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit
 - pull, fetch: fix segfault in --set-upstream option

 "git fetch --set-upstream" did not check if there is a current
 branch, leading to a segfault when it is run on a detached HEAD,
 which has been corrected.

 Will merge to 'next'.
 source: <patch-v5-1.1-69ab40d623b-20211207T215115Z-avarab@gmail.com>


* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit
  (merged to 'next' on 2021-12-07 at e37b4e16d0)
 + cbtree: remove broken and unused cb_unlink

 Code clean-up.

 Will merge to 'master'.
 source: <20211207183810.688481-1-e@80x24.org>


* ab/cat-file (2021-12-08) 10 commits
 - cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)
 - object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY
 - cat-file: correct and improve usage information
 - cat-file: fix remaining usage bugs
 - cat-file: make --batch-all-objects a CMDMODE
 - cat-file: move "usage" variable to cmd_cat_file()
 - cat-file docs: fix SYNOPSIS and "-h" output
 - parse-options API: add a usage_msg_optf()
 - cat-file tests: test messaging on bad objects/paths
 - cat-file tests: test bad usage

 Assorted updates to "git cat-file", especially "-h".
 source: <cover-v4-00.10-00000000000-20211208T123151Z-avarab@gmail.com>


* ab/grep-patterntype (2021-12-04) 7 commits
 - grep: simplify config parsing and option parsing
 - grep API: call grep_config() after grep_init()
 - grep.c: don't pass along NULL callback value
 - built-ins: trust the "prefix" from run_builtin()
 - grep tests: add missing "grep.patternType" config test
 - log tests: check if grep_config() is called by "log"-like cmds
 - grep.h: remove unused "regex_t regexp" from grep_opt

 Some code clean-up in the "git grep" machinery.

 Needs review.
 source: <cover-v4-0.7-00000000000-20211203T101348Z-avarab@gmail.com>


* js/use-builtin-add-i (2021-12-08) 3 commits
 - fixup! add -i: default to the built-in implementation
 - add -i: default to the built-in implementation
 - t2016: require the PERL prereq only when necessary

 "git add -i" was rewritten in C some time ago and has been in
 testing; the reimplementation is now exposed to general public by
 default.

 On hold.
 There are known breakages on macOS.
 cf. <nycvar.QRO.7.76.6.2112021832060.63@tvgsbejvaqbjf.bet>
 source: <pull.1087.git.1638281655.gitgitgadget@gmail.com>


* jt/conditional-config-on-remote-url (2021-12-04) 2 commits
 - config: include file if remote URL matches a glob
 - config: make git_config_include() static

 The conditional inclusion mechanism of configuration files using
 "[includeIf <condition>]" learns to base its decision on the
 URL of the remote repository the repository interacts with.

 Needs review.
 source: <cover.1638487815.git.jonathantanmy@google.com>


* tb/cruft-packs (2021-11-29) 17 commits
 - sha1-file.c: don't freshen cruft packs
 - builtin/gc.c: conditionally avoid pruning objects via loose
 - builtin/repack.c: add cruft packs to MIDX during geometric repack
 - builtin/repack.c: use named flags for existing_packs
 - builtin/repack.c: allow configuring cruft pack generation
 - builtin/repack.c: support generating a cruft pack
 - builtin/pack-objects.c: --cruft with expiration
 - reachable: report precise timestamps from objects in cruft packs
 - reachable: add options to add_unseen_recent_objects_to_traversal
 - builtin/pack-objects.c: --cruft without expiration
 - builtin/pack-objects.c: return from create_object_entry()
 - t/helper: add 'pack-mtimes' test-tool
 - pack-mtimes: support writing pack .mtimes files
 - chunk-format.h: extract oid_version()
 - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'
 - pack-mtimes: support reading .mtimes files
 - Documentation/technical: add cruft-packs.txt

 Instead of leaving unreachable objects in loose form when packing,
 or ejecting them into loose form when repacking, gather them in a
 packfile with an auxiliary file that records the last-use time of
 these objects.

 Expecting a reroll.
 source: <cover.1638224692.git.me@ttaylorr.com>


* cb/save-term-across-editor-invocation (2021-12-01) 3 commits
 - fixup! editor: allow for saving/restoring terminal state
 - editor: allow for saving/restoring terminal state
 - terminal: teach save_term to fail when not foreground

 Some editors are reported to leave the terminal in funny state
 after they exit on Windows.  Work it around by saving and restoring
 the terminal state when needed.

 Expecting a reroll.
 cf. <CAPUEsphktbdxeV7hvF52Or3CVHS8oOk5-WV=xfEZa8kfCVVnVg@mail.gmail.com>
 source: <20211202035446.1154-1-carenas@gmail.com>


* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits
  (merged to 'next' on 2021-12-10 at 80585b2755)
 + log: load decorations with --simplify-by-decoration
 + log: handle --decorate-refs with userformat "%d"

 When "git log" implicitly enabled the "decoration" processing
 without being explicitly asked with "--decorate" option, it failed
 to read and honor the settings given by the "--decorate-refs"
 option.

 Will merge to 'master'.
 source: <YahbseXEC66dK0k8@coredump.intra.peff.net>


* jl/subtree-check-parents-argument-passing-fix (2021-12-05) 1 commit
 - subtree: fix argument handling in check_parents

 Fix performance-releated bug in "git subtree" (in contrib/).

 Expecting a reroll.
 cf. <nycvar.QRO.7.76.6.2112072243310.90@tvgsbejvaqbjf.bet>
 source: <pull.1086.v3.git.1638758742741.gitgitgadget@gmail.com>


* ab/ambiguous-object-name (2021-11-26) 6 commits
 - object-name: re-use "struct strbuf" in show_ambiguous_object()
 - object-name: iterate ambiguous objects before showing header
 - object-name: show date for ambiguous tag objects
 - object-name: make ambiguous object output translatable
 - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()
 - object-name tests: add tests for ambiguous object blind spots

 Error output given in response to an ambiguous object name has been
 improved.

 Needs review.
 An earlier iteration that was much smaller had seen some reviews,
 but the latest round enlarged its scope and needs to be reviewed
 afresh.
 source: <patch-v5-6.6-78bb0995f08-20211125T215529Z-avarab@gmail.com>


* ds/trace2-regions-in-tests (2021-11-29) 2 commits
  (merged to 'next' on 2021-12-07 at ebf31cbaad)
 + t/t*: remove custom GIT_TRACE2_EVENT_NESTING
 + test-lib.sh: set GIT_TRACE2_EVENT_NESTING

 The default setting for trace2 event nesting was too low to cause
 test failures, which is worked around by bumping it up in the test
 framework.

 Will merge to 'master'.
 source: <pull.1085.git.1638193666.gitgitgadget@gmail.com>


* hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits
  (merged to 'next' on 2021-12-08 at 8fb70ef68b)
 + t1430: create valid symrefs using test-helper
 + t1430: remove refs using test-tool
 + refs: introduce REF_SKIP_REFNAME_VERIFICATION flag
 + refs: introduce REF_SKIP_OID_VERIFICATION flag
 + refs: update comment.
 + test-ref-store: plug memory leak in cmd_delete_refs
 + test-ref-store: parse symbolic flag constants
 + test-ref-store: remove force-create argument for create-reflog

 The test helper for refs subsystem learned to write bogus and/or
 nonexistent object name to refs to simulate error situations we
 want to test Git in.

 Will merge to 'master'.
 source: <pull.1147.v4.git.git.1638884300.gitgitgadget@gmail.com>


* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit
  (merged to 'next' on 2021-12-07 at 074438a4ba)
 + t1404: mark directory/file conflict tests with REFFILES

 Test update.

 Will merge to 'master'.
 source: <pull.1148.v2.git.git.1638210022966.gitgitgadget@gmail.com>


* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit
  (merged to 'next' on 2021-12-08 at ba5693952d)
 + refs: document callback for reflog-ent iterators

 Document the parameters given to the reflog entry iterator callback
 functions.

 Will merge to 'master'.
 source: <xmqqk0gs5bgw.fsf@gitster.g>


* jc/grep-patterntype-default-doc (2021-12-05) 1 commit
  (merged to 'next' on 2021-12-10 at e46385ad9d)
 + grep: clarify what `grep.patternType=default` means

 Doc update.

 Will merge to 'master'.
 source: <xmqqy24ykdel.fsf_-_@gitster.g>


* ab/ci-updates (2021-11-23) 5 commits
  (merged to 'next' on 2021-12-07 at 1d855a6b33)
 + CI: don't run "make test" twice in one job
 + CI: use "$runs_on_pool", not "$jobname" to select packages & config
 + CI: rename the "Linux32" job to lower-case "linux32"
 + CI: use shorter names that fit in UX tooltips
 + CI: remove Travis CI support

 Drop support for TravisCI and update test workflows at GitHub.

 Will merge to 'master'.
 source: <cover-v4-0.5-00000000000-20211123T134300Z-avarab@gmail.com>


* en/keep-cwd (2021-12-09) 11 commits
 - t2501: simplify the tests since we can now assume desired behavior
 - dir: new flag to remove_dir_recurse() to spare the original_cwd
 - dir: avoid incidentally removing the original_cwd in remove_path()
 - stash: do not attempt to remove startup_info->original_cwd
 - rebase: do not attempt to remove startup_info->original_cwd
 - clean: do not attempt to remove startup_info->original_cwd
 - symlinks: do not include startup_info->original_cwd in dir removal
 - unpack-trees: add special cwd handling
 - unpack-trees: refuse to remove startup_info->original_cwd
 - setup: introduce startup_info->original_cwd
 - t2501: add various tests for removing the current working directory

 Many git commands that deal with working tree files try to remove a
 directory that becomes empty (i.e. "git switch" from a branch that
 has the directory to another branch that does not would attempt
 remove all files in the directory and the directory itself).  This
 drops users into an unfamiliar situation if the command was run in
 a subdirectory that becomes subject to removal due to the command.
 The commands have been taught to keep an empty directory if it is
 the directory they were started in to avoid surprising users.

 Will merge to 'next'?
 source: <pull.1140.v6.git.git.1639026515.gitgitgadget@gmail.com>


* ab/run-command (2021-11-25) 9 commits
  (merged to 'next' on 2021-12-07 at 5c0bedf853)
 + run-command API: remove "env" member, always use "env_array"
 + difftool: use "env_array" to simplify memory management
 + run-command API: remove "argv" member, always use "args"
 + run-command API users: use strvec_push(), not argv construction
 + run-command API users: use strvec_pushl(), not argv construction
 + run-command tests: use strvec_pushv(), not argv assignment
 + run-command API users: use strvec_pushv(), not argv assignment
 + upload-archive: use regular "struct child_process" pattern
 + worktree: stop being overly intimate with run_command() internals

 API clean-up.

 Will merge to 'master'.
 cf. <211130.86k0gpcpy2.gmgdl@evledraar.gmail.com>
 cf. <CAPig+cSvFgJTiq8pXrWy_7ukQwE1y9ZGwMgKmyjWuQHdNGxiDQ@mail.gmail.com>
 source: <cover-v3-0.9-00000000000-20211125T224833Z-avarab@gmail.com>


* hn/reflog-tests (2021-12-02) 5 commits
  (merged to 'next' on 2021-12-07 at 84d4e4b211)
 + refs/debug: trim trailing LF from reflog message
 + test-ref-store: tweaks to for-each-reflog-ent format
 + t1405: check for_each_reflog_ent_reverse() more thoroughly
 + test-ref-store: don't add newline to reflog message
 + show-branch: show reflog message

 Prepare tests on ref API to help testing reftable backends.

 Will merge to 'master'.
 source: <pull.1145.v3.git.git.1638466593.gitgitgadget@gmail.com>


* tl/ls-tree-oid-only (2021-11-22) 1 commit
 - ls-tree.c: support `--oid-only` option for "git-ls-tree"

 "git ls-tree" learns "--oid-only" option, similar to "--name-only".

 Expecting a reroll.
 source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>


* ab/make-dependency (2021-11-18) 24 commits
 - Makefile: move ".SUFFIXES" rule to shared.mak
 - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)
 - Makefile: disable GNU make built-in wildcard rules
 - Makefile: use $(file) I/O instead of "FORCE" when possible
 - Makefile: correct the dependency graph of hook-list.h
 - Makefiles: add and use wildcard "mkdir -p" template
 - Makefile: use $(wspfx) for $(QUIET...) in shared.mak
 - Makefile: add "$(QUIET)" boilerplate to shared.mak
 - Makefile: add a "TRACK_template" for GIT-*{FLAGS,DEFINES,...}
 - Makefile: re-add and use the "shellquote" macros
 - Makefile: move $(comma), $(empty) and $(space) to shared.mak
 - Makefiles: add "shared.mak", move ".DELETE_ON_ERROR" to it
 - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts
 - Makefile: create a GIT-PYTHON-DEFINES, like "PERL"
 - Makefile: correct "GIT-PERL-{DEFINES,HEADER}" dependency graph
 - Makefile: adjust Perl-related comments & whitespace
 - Makefile: change "ifndef NO_PERL" to "ifdef NO_PERL"
 - Makefile: guard Perl-only variable assignments
 - Makefile: remove "mv $@ $@+" dance redundant to .DELETE_ON_ERROR
 - Makefile: clean perl/build/ even with NO_PERL=Y
 - Makefile: use "=" not ":=" for po/* and perl/*
 - Makefile: don't set up "perl/build" rules under NO_PERL=Y
 - Makefile: don't invoke msgfmt with --statistics
 - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency

 Dependency clean-up.

 Needs review.
 There are some comments on earlier rounds; the latest one needs a
 serious review or at least Acks from past commentors.
 source: <patch-v4-23.23-48a3927d972-20211117T101807Z-avarab@gmail.com>


* ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits
 . test-read-cache: remove --table, --expand options
 . t1091/t3705: remove 'test-tool read-cache --table'
 . t1092: replace 'read-cache --table' with 'ls-files --sparse'
 . ls-files: add --sparse option
 . fetch/pull: use the sparse index
 . Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index
 (this branch uses ld/sparse-diff-blame.)

 "git fetch" and "git pull" are now declared sparse-index clean.
 Also "git ls-files" learns the "--sparse" option to help debugging.

 Ejected from 'seen', as it seems to fail its self-test.
 source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>


* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits
  (merged to 'next' on 2021-12-10 at 2d0c8cb8e6)
 + ssh signing: make sign/amend test more resilient
 + ssh signing: support non ssh-* keytypes

 The cryptographic signing using ssh keys can specify literal keys
 for keytypes whose name do not begin with the "ssh-" prefix by
 using the "key::" prefix mechanism (e.g. "key::ecdsa-sha2-nistp256").

 Will merge to 'master'.
 source: <20211119150707.3924636-1-fs@gigacodes.de>


* fs/test-prereq (2021-12-01) 3 commits
  (merged to 'next' on 2021-12-07 at fc8a8e0006)
 + test-lib: make BAIL_OUT() work in tests and prereq
 + test-lib: introduce required prereq for test runs
 + test-lib: show missing prereq summary

 The test framework learns to list unsatisfied test prerequisites,
 and optionally error out when prerequisites that are expected to be
 satisfied are not.

 Will merge to 'master'.
 source: <20211201085315.576865-1-fs@gigacodes.de>


* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits
  (merged to 'next' on 2021-12-07 at 8cdad7bc9a)
 + xdiff: drop unused flags parameter from recs_match
 + xdiff: drop xpparam_t parameter from histogram cmp_recs()
 + xdiff: drop CMP_ENV macro from xhistogram
  (merged to 'next' on 2021-12-02 at 5ccd12d09b)
 + xdiff: simplify comparison
 + xdiff: avoid unnecessary memory allocations
 + diff histogram: intern strings

 "diff --histogram" optimization.

 Will merge to 'master'.
 source: <Yammtm+pIkMu43zZ@coredump.intra.peff.net>
 source: <pull.1079.git.1637148025.gitgitgadget@gmail.com>


* xw/am-empty (2021-12-07) 3 commits
 - am: support --allow-empty to record specific empty patches
 - am: support --empty=<option> to handle empty patches
 - doc: git-format-patch: describe the option --always

 "git am" learns "--empty=(die|drop|keep)" option to tweak what is
 done to a piece of e-mail without a patch in it.

 Almost there.
 source: <pull.1076.v18.git.1638939946.gitgitgadget@gmail.com>


* rj/receive-pack-avoid-sigpipe-during-status-reporting (2021-11-10) 1 commit
  (merged to 'next' on 2021-12-07 at 91039a781e)
 + receive-pack: ignore SIGPIPE while reporting status to client

 When the "git push" command is killed while the receiving end is
 trying to report what happened to the ref update proposals, the
 latter used to die, due to SIGPIPE.  The code now ignores SIGPIPE
 to increase our chances to run the post-receive hook after it
 happens.

 Will merge to 'master'.
 source: <20211110092942.1648429-1-robin@jarry.cc>


* ab/parse-options-cleanup (2021-11-10) 1 commit
  (merged to 'next' on 2021-12-08 at f9a2ceb9f6)
 + parse-options.c: use "enum parse_opt_result" for parse_nodash_opt()

 Change the type of an internal function to return an enum (instead
 of int) and replace -2 that was used to signal an error with -1.

 Will merge to 'master'.
 source: <patch-v2-1.1-376f76bb44e-20211110T012523Z-avarab@gmail.com>


* jc/c99-var-decl-in-for-loop (2021-12-03) 1 commit
  (merged to 'next' on 2021-12-03 at 57100223b2)
 + revision: use C99 declaration of variable in for() loop

 Weather balloon to find compilers that do not grok variable
 declaration in the for() loop.

 Will merge to 'master'.
 source: <xmqqpmr2j5lq.fsf_-_@gitster.g>


* ak/protect-any-current-branch (2021-12-01) 8 commits
  (merged to 'next' on 2021-12-10 at dd2c6a557c)
 + branch: protect branches checked out in all worktrees
 + receive-pack: protect current branch for bare repository worktree
 + receive-pack: clean dead code from update_worktree()
 + fetch: protect branches checked out in all worktrees
 + worktree: simplify find_shared_symref() memory ownership model
 + branch: lowercase error messages
 + receive-pack: lowercase error messages
 + fetch: lowercase error messages

 "git fetch" without the "--update-head-ok" option ought to protect
 a checked out branch from getting updated, to prevent the working
 tree that checks it out to go out of sync.  The code was written
 before the use of "git worktree" got widespread, and only checked
 the branch that was checked out in the current worktree, which has
 been updated.
 (originally called ak/fetch-not-overwrite-any-current-branch)

 Will merge to 'master'.
 source: <20211201221547.1796213-1-andersk@mit.edu>


* ab/mark-leak-free-tests-even-more (2021-11-01) 15 commits
  (merged to 'next' on 2021-12-03 at 1d8c342dab)
 + leak tests: mark some fast-import tests as passing with SANITIZE=leak
 + leak tests: mark some config tests as passing with SANITIZE=leak
 + leak tests: mark some status tests as passing with SANITIZE=leak
 + leak tests: mark some clone tests as passing with SANITIZE=leak
 + leak tests: mark some add tests as passing with SANITIZE=leak
 + leak tests: mark some diff tests as passing with SANITIZE=leak
 + leak tests: mark some apply tests as passing with SANITIZE=leak
 + leak tests: mark some notes tests as passing with SANITIZE=leak
 + leak tests: mark some update-index tests as passing with SANITIZE=leak
 + leak tests: mark some rev-parse tests as passing with SANITIZE=leak
 + leak tests: mark some rev-list tests as passing with SANITIZE=leak
 + leak tests: mark some misc tests as passing with SANITIZE=leak
 + leak tests: mark most gettext tests as passing with SANITIZE=leak
 + leak tests: mark "sort" test as passing SANITIZE=leak
 + leak tests: mark a read-tree test as passing SANITIZE=leak

 More tests are marked as leak-free.

 Will merge to 'master'.
 source: <cover-00.15-00000000000-20211030T221945Z-avarab@gmail.com>


* ew/test-wo-fsync (2021-10-29) 1 commit
  (merged to 'next' on 2021-12-08 at 4b90e4870a)
 + tests: disable fsync everywhere

 Allow running our tests while disabling fsync.

 Will merge to 'master'.
 Received a lukewarm reactions overall.  Perhaps we should drop instead?
 source: <20211029001552.GA29647@dcvr>


* re/color-default-reset (2021-10-28) 3 commits
  (merged to 'next' on 2021-12-08 at ab3ff50ce2)
 + color: allow colors to be prefixed with "reset"
 + color: support "default" to restore fg/bg color
 + color: add missing GIT_COLOR_* white/black constants

 "default" and "reset" colors have been added to our palette.

 Will merge to 'master'.
 Seems to have stalled, but I am OK to merge it as-is.
 cf. <881B4747-B0B5-459B-B673-06972275A8B8@gmail.com>
 source: <pull.1117.git.git.1635210227532.gitgitgadget@gmail.com>
 source: <pull.1116.git.git.1635201156.gitgitgadget@gmail.com>


* pw/diff-color-moved-fix (2021-12-09) 15 commits
 - diff --color-moved: intern strings
 - diff: use designated initializers for emitted_diff_symbol
 - diff --color-moved-ws=allow-indentation-change: improve hash lookups
 - diff --color-moved: stop clearing potential moved blocks
 - diff --color-moved: shrink potential moved blocks as we go
 - diff --color-moved: unify moved block growth functions
 - diff --color-moved: call comparison function directly
 - diff --color-moved-ws=allow-indentation-change: simplify and optimize
 - diff: simplify allow-indentation-change delta calculation
 - diff --color-moved: avoid false short line matches and bad zebra coloring
 - diff --color-moved=zebra: fix alternate coloring
 - diff --color-moved: rewind when discarding pmb
 - diff --color-moved: factor out function
 - diff --color-moved: clear all flags on blocks that are too short
 - diff --color-moved: add perf tests

 Correctness and performance update to "diff --color-moved" feature.

 Will merge to 'next'?
 source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>


* es/pretty-describe-more (2021-11-01) 3 commits
  (merged to 'next' on 2021-12-07 at e7862a34c8)
 + pretty: add abbrev option to %(describe)
 + pretty: add tag option to %(describe)
 + pretty.c: rework describe options parsing for better extensibility

 Extend "git log --format=%(describe)" placeholder to allow passing
 selected command-line options to the underlying "git describe"
 command.

 Will merge to 'master'.
 source: <20211031171510.1646396-1-eschwartz@archlinux.org>


* fs/ssh-signing-key-lifetime (2021-12-09) 9 commits
  (merged to 'next' on 2021-12-10 at d5e7bd8b79)
 + ssh signing: verify ssh-keygen in test prereq
 + ssh signing: make fmt-merge-msg consider key lifetime
 + ssh signing: make verify-tag consider key lifetime
 + ssh signing: make git log verify key lifetime
 + ssh signing: make verify-commit consider key lifetime
 + ssh signing: add key lifetime test prereqs
 + ssh signing: use sigc struct to pass payload
 + t/fmt-merge-msg: make gpgssh tests more specific
 + t/fmt-merge-msg: do not redirect stderr

 Extend the signing of objects with SSH keys and learn to pay
 attention to the key validity time range when verifying.

 Will merge to 'master'.
 source: <20211209085249.13587-1-fs@gigacodes.de>


* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
 - (wip) reword the final review part
 - SubmittingPatchs: clarify choice of base and testing

 Extend the guidance to choose the base commit to build your work
 on, and hint/nudge contributors to read others' changes.

 Expecting a reroll.
 Stalled after one incremental update suggestion.
 cf. <xmqqa6ix2g6a.fsf@gitster.g>
 source: <xmqqa6izcwio.fsf_-_@gitster.g>


* ab/config-based-hooks-2 (2021-11-24) 18 commits
 - run-command: remove old run_hook_{le,ve}() hook API
 - receive-pack: convert push-to-checkout hook to hook.h
 - read-cache: convert post-index-change to use hook.h
 - commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
 - git-p4: use 'git hook' to run hooks
 - send-email: use 'git hook run' for 'sendemail-validate'
 - git hook run: add an --ignore-missing flag
 - hooks: convert worktree 'post-checkout' hook to hook library
 - hooks: convert non-worktree 'post-checkout' hook to hook library
 - merge: convert post-merge to use hook.h
 - am: convert applypatch-msg to use hook.h
 - rebase: convert pre-rebase to use hook.h
 - hook API: add a run_hooks_l() wrapper
 - am: convert {pre,post}-applypatch to use hook.h
 - gc: use hook library for pre-auto-gc hook
 - hook API: add a run_hooks() wrapper
 - hook: add 'run' subcommand
 - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2

 More "config-based hooks".

 Needs review.
 At this point, as Ævar and Emily both read the major part of this
 series, a final and quick read-over plus an Ack by Emily on her
 part plus a serious review on the patches attributed to Ævar by
 somebody other than Ævar would be sufficient to move it in some
 direction (hopefully forward).
 source: <cover-v5-00.17-00000000000-20211123T114206Z-avarab@gmail.com>


* js/branch-track-inherit (2021-12-07) 2 commits
 . branch: add flags and config to inherit tracking
 . branch: accept multiple upstream branches for tracking
 (this branch is used by gc/branch-recurse-submodules.)

 "git -c branch.autosetupmerge=inherit branch new old" makes "new"
 to have the same upstream as the "old" branch, instead of marking
 "old" itself as its upstream.

 Waiting for a response
 cf. <xmqqk0gg6wqn.fsf@gitster.g>
 source: <cover.1638859949.git.steadmon@google.com>


* jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
 - t7527: test status with untracked-cache and fsmonitor--daemon
 - fsmonitor: force update index after large responses
 - fsmonitor--daemon: use a cookie file to sync with file system
 - fsmonitor--daemon: periodically truncate list of modified files
 - t/perf/p7519: add fsmonitor--daemon test cases
 - t/perf/p7519: speed up test on Windows
 - t/helper/test-chmtime: skip directories on Windows
 - t/perf: avoid copying builtin fsmonitor files into test repo
 - t7527: create test for fsmonitor--daemon
 - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
 - help: include fsmonitor--daemon feature flag in version info
 - fsmonitor--daemon: implement handle_client callback
 - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
 - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
 - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
 - fsmonitor--daemon: create token-based changed path cache
 - fsmonitor--daemon: define token-ids
 - fsmonitor--daemon: add pathname classification
 - fsmonitor--daemon: implement 'start' command
 - fsmonitor--daemon: implement 'run' command
 - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
 - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
 - fsmonitor--daemon: implement 'stop' and 'status' commands
 - fsmonitor--daemon: add a built-in fsmonitor daemon
 - fsmonitor: document builtin fsmonitor
 - fsmonitor: use IPC to query the builtin FSMonitor daemon
 - fsmonitor: config settings are repository-specific
 - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
 - fsmonitor: enhance existing comments

 Built-in fsmonitor (part 2).

 Expecting a reroll.
 Seems that the discussion stalled.
 cf. <d9c3ef61-768c-3560-2858-3438c355a742@jeffhostetler.com>
 source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>


* ld/sparse-diff-blame (2021-12-06) 8 commits
  (merged to 'next' on 2021-12-10 at 57b89936d6)
 + blame: enable and test the sparse index
 + diff: enable and test the sparse index
 + diff: replace --staged with --cached in t1092 tests
 + repo-settings: prepare_repo_settings only in git repos
 + test-read-cache: set up repo after git directory
 + commit-graph: return if there is no git directory
 + git: ensure correct git directory setup with -h
 + Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
 (this branch is used by ds/fetch-pull-with-sparse-index.)

 Teach diff and blame to work well with sparse index.

 Will merge to 'master'.
 source: <pull.1050.v6.git.1638806161.gitgitgadget@gmail.com>


* ns/remerge-diff (2021-12-08) 8 commits
 - doc/diff-options: explain the new --remerge-diff option
 - show, log: adapt Elijah Newren's changes to common tmp-objdir API
 - show, log: provide a --remerge-diff capability
 - merge-ort: capture and print ll-merge warnings in our preferred fashion
 - ll-merge: add API for capturing warnings in a strbuf instead of stderr
 - merge-ort: add ability to record conflict messages in a file
 - merge-ort: mark a few more conflict messages as omittable
 - Merge branch 'ns/tmp-objdir' into ns/remerge-diff
 (this branch uses ns/tmp-objdir.)

 A new presentation for two-parent merge "--remerge-diff" can be
 used to show the difference between mechanical (and possibly
 conflicted) merge results and the recorded resolution.

 Expecting a reroll.
 cf. <CABPp-BHq4DnkCZZ+HcnGiZYKHpWJgzMBjMDuWbbTFYPesm2sXA@mail.gmail.com>
 This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the
 "create objects temporarily, only to discard without committing
 them to longer-term storage" infrastructure with another topic.


* ns/tmp-objdir (2021-12-08) 2 commits
 - tmp-objdir: disable ref updates when replacing the primary odb
 - tmp-objdir: new API for creating temporary writable databases
 (this branch is used by ns/batched-fsync and ns/remerge-diff.)

 New interface into the tmp-objdir API to help in-core use of the
 quarantine feature.

 Will merge to 'next'.
 source: <pull.1091.v3.git.1638828305.gitgitgadget@gmail.com>


* es/superproject-aware-submodules (2021-11-18) 5 commits
 - submodule: use config to find superproject worktree
 - submodule: record superproject gitdir during 'update'
 - submodule: record superproject gitdir during absorbgitdirs
 - introduce submodule.superprojectGitDir record
 - t7400-submodule-basic: modernize inspect() helper

 A configuration variable in a submodule points at the location of
 the superproject it is bound to (RFC).

 Expecting a reroll.
 cf. <20211117234300.2598132-1-jonathantanmy@google.com>
 source: <20211117005701.371808-1-emilyshaffer@google.com>


* ns/batched-fsync (2021-12-08) 8 commits
 - core.fsyncobjectfiles: performance tests for add and stash
 - core.fsyncobjectfiles: tests for batch mode
 - unpack-objects: use the bulk-checkin infrastructure
 - update-index: use the bulk-checkin infrastructure
 - core.fsyncobjectfiles: add windows support for batch mode
 - core.fsyncobjectfiles: batched disk flushes
 - bulk-checkin: rename 'state' variable and separate 'plugged' boolean
 - Merge branch 'ns/tmp-objdir' into ns/batched-fsync
 (this branch uses ns/tmp-objdir.)

 The "core.fsyncobjectfiles" configuration variable can now be set
 to "batch" for improved performance.

 Expecting a reroll.
 cf. <CABPp-BHq4DnkCZZ+HcnGiZYKHpWJgzMBjMDuWbbTFYPesm2sXA@mail.gmail.com>
 source: <pull.1076.v9.git.git.1637020263.gitgitgadget@gmail.com>


* en/zdiff3 (2021-12-01) 2 commits
  (merged to 'next' on 2021-12-07 at baa3b24593)
 + update documentation for new zdiff3 conflictStyle
 + xdiff: implement a zealous diff3, or "zdiff3"

 "Zealous diff3" style of merge conflict presentation has been added.

 Will merge to 'master'.
 source: <pull.1036.v5.git.git.1638317108.gitgitgadget@gmail.com>


* js/scalar (2021-12-04) 15 commits
  (merged to 'next' on 2021-12-10 at 6248603a80)
 + scalar: implement the `version` command
 + scalar: implement the `delete` command
 + scalar: teach 'reconfigure' to optionally handle all registered enlistments
 + scalar: allow reconfiguring an existing enlistment
 + scalar: implement the `run` command
 + scalar: teach 'clone' to support the --single-branch option
 + scalar: implement the `clone` subcommand
 + scalar: implement 'scalar list'
 + scalar: let 'unregister' handle a deleted enlistment directory gracefully
 + scalar: 'unregister' stops background maintenance
 + scalar: 'register' sets recommended config and starts maintenance
 + scalar: create test infrastructure
 + scalar: start documenting the command
 + scalar: create a rudimentary executable
 + scalar: add a README with a roadmap

 Add pieces from "scalar" to contrib/.

 Will merge to 'master'.
 source: <pull.1005.v10.git.1638538470.gitgitgadget@gmail.com>


* ab/only-single-progress-at-once (2021-11-03) 8 commits
 - progress.c: add & assert a "global_progress" variable
 - various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
 - pack-bitmap-write.c: don't return without stop_progress()
 - progress.c: add temporary variable from progress struct
 - progress.c tests: test some invalid usage
 - progress.c tests: make start/stop commands on stdin
 - progress.c test helper: add missing braces
 - leak tests: fix a memory leaks in "test-progress" helper

 Further tweaks on progress API.

 Needs review.
 The last three rounds has seen little reaction, even though earlier
 round saw a lot of responses. The latest round needs a serious
 review or at least Acks from past commentors.
 source: <cover-v6-0.8-00000000000-20211102T122507Z-avarab@gmail.com>


* hn/reftable (2021-10-08) 19 commits
  (merged to 'next' on 2021-12-03 at 767ec5d9b3)
 + Add "test-tool dump-reftable" command.
 + reftable: add dump utility
 + reftable: implement stack, a mutable database of reftable files.
 + reftable: implement refname validation
 + reftable: add merged table view
 + reftable: add a heap-based priority queue for reftable records
 + reftable: reftable file level tests
 + reftable: read reftable files
 + reftable: generic interface to tables
 + reftable: write reftable files
 + reftable: a generic binary tree implementation
 + reftable: reading/writing blocks
 + Provide zlib's uncompress2 from compat/zlib-compat.c
 + reftable: (de)serialization for the polymorphic record type.
 + reftable: add blocksource, an abstraction for random access reads
 + reftable: utility functions
 + reftable: add error related functionality
 + reftable: add LICENSE
 + hash.h: provide constants for the hash IDs
 (this branch is used by hn/reftable-coverity-fixes.)

 The "reftable" backend for the refs API, without integrating into
 the refs subsystem, has been added.

 Will merge to 'master'.
 source: <pull.1081.v4.git.git.1633638315.gitgitgadget@gmail.com>

--------------------------------------------------
[Discarded]

* 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.

 Superseded by the ab/fetch-set-upstream-while-detached topic
 source: <20210706162238.575988-1-clemens@endorphin.org>

ns/batched-fsync and ns/remerge-diff

[Neeraj Singh]

Hi Junio,
I'd recommend dropping ns/batched-fsync from 'seen' since it will be pretty much rewritten on top of ns/core-fsync [1]. I don't think there's value in looking for conflicts or testing the current version.

Also my understanding is that ns/remerge-diff will be dropped in favor of an updated series from Elijah Newren.

Thanks and have a good weekend,
Neeraj

1. https://lore.kernel.org/git/pull.1093.v3.git.1639011433.gitgitgadget@gmail.com/

Re: ns/batched-fsync and ns/remerge-diff

[Elijah Newren]

On Fri, Dec 10, 2021 at 10:33 PM Neeraj Singh <nksingh85@gmail.com> wrote:
>
...
> Also my understanding is that ns/remerge-diff will be dropped in favor of an updated series from Elijah Newren.

Yep, waiting for ns/tmp-objdir to hit next so we don't have multiple
dependent topics in flight, as Junio has frowned on those before.
After that happens, I'll send in a reroll of my topic.

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Eric Sunshine]

On 12/10/21 9:52 PM, Junio C Hamano wrote:
> * es/doc-stdout-vs-stderr (2021-12-04) 1 commit
>    (merged to 'next' on 2021-12-07 at d6487c1256)
>   + CodingGuidelines: document which output goes to stdout vs. stderr
> 
>   Coding guideline document has been updated to clarify what goes to
>   standard error i nour system.

s/i nour/in our/

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Junio C Hamano]

Eric Sunshine <sunshine@sunshineco.com> writes:

> On 12/10/21 9:52 PM, Junio C Hamano wrote:
>> * es/doc-stdout-vs-stderr (2021-12-04) 1 commit
>>    (merged to 'next' on 2021-12-07 at d6487c1256)
>>   + CodingGuidelines: document which output goes to stdout vs. stderr
>>   Coding guideline document has been updated to clarify what goes to
>>   standard error i nour system.
>
> s/i nour/in our/

Thanks.  This time I won't forget ;-)

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Elijah Newren]

Hi,

On Fri, Dec 10, 2021 at 10:31 PM Junio C Hamano <gitster@pobox.com> wrote:

> * en/sparse-checkout-set (2021-12-08) 10 commits
...
>  Need to check the reroll.
>  cf. <pull.1151.v3.git.git.1639108573.gitgitgadget@gmail.com>
>  source: <pull.1151.v2.git.git.1638908410.gitgitgadget@gmail.com>

I'm confused by the status here; en/sparse-checkout-set already
represents v3, not v2, so you've already picked up the reroll.  (v3 is
the one containing both Stolee & Victoria's Reviewed-by.)  I think
that also means your cf. should be labeled as the source, yes?



> * es/test-chain-lint (2021-12-09) 19 commits
...
>
>  Broken &&-chains in the test scripts have been corrected.
>
>  Will merge to 'next'?

Eric sent a reroll of just patch 2 with some working clarifications.
It's a small thing, but I think it'd be great if that re-rolled patch
could be picked up and inserted into the series.  Other than that,
yeah the series is good to merge down.  (Peff and Fabian seemed to
think so too.)



> * ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits
...
>  Ejected from 'seen', as it seems to fail its self-test.
>  source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>

I _think_ Stolee addressed this in his v3 cover letter with his
comment that he also needed to merge with master[1].  However, there
are two more things pointed out by Ævar that need fixing[2]; maybe by
the time those two items are fixed, ld/sparse-diff-blame will merge to
master and he can rebase on master?

[1] https://lore.kernel.org/git/pull.1080.v3.git.1639149192.gitgitgadget@gmail.com/
[2] https://lore.kernel.org/git/CABPp-BEs5gnX+HfPNMRBqtMdhVfkk5oKDT8sN4fJiPG87JDjcw@mail.gmail.com/


> * pw/diff-color-moved-fix (2021-12-09) 15 commits
...
>  Will merge to 'next'?
>  source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>

Dscho seemed to suggest that course of action[2].  (I also looked at
the series, though much more lightly -- I couldn't spot any problems.)

[2] https://lore.kernel.org/git/nycvar.QRO.7.76.6.2112081329030.90@tvgsbejvaqbjf.bet/.

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Junio C Hamano]

Elijah Newren <newren@gmail.com> writes:

>> * en/sparse-checkout-set (2021-12-08) 10 commits
> ...
>>  Need to check the reroll.
>>  cf. <pull.1151.v3.git.git.1639108573.gitgitgadget@gmail.com>
>>  source: <pull.1151.v2.git.git.1638908410.gitgitgadget@gmail.com>
>
> I'm confused by the status here; en/sparse-checkout-set already
> represents v3, not v2, so you've already picked up the reroll.  (v3 is
> the one containing both Stolee & Victoria's Reviewed-by.)  I think
> that also means your cf. should be labeled as the source, yes?

And the old one needs to be dropped.  I meant to do so after
checking the v3 myself but haven't got around to it when the report
was sent.

>> * es/test-chain-lint (2021-12-09) 19 commits
> ...
>>
>>  Broken &&-chains in the test scripts have been corrected.
>>
>>  Will merge to 'next'?
>
> Eric sent a reroll of just patch 2 with some working clarifications.
> It's a small thing, but I think it'd be great if that re-rolled patch
> could be picked up and inserted into the series.  Other than that,
> yeah the series is good to merge down.  (Peff and Fabian seemed to
> think so too.)

Pointers?

I know Eric said in
<CAPig+cR0eKhz+ncWb4v9dSY0A03P+K0+WT90J2cBKvLqT8DXrA@mail.gmail.com>
"I am a bit hesitant about spamming the list", but I do not know
what came after it.

... starts a browser and looks ...

OK.  I found it at
https://lore.kernel.org/git/20211211095837.26387-1-sunshine@sunshineco.com/

Will take a look.  Thanks.

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Junio C Hamano]

Elijah Newren <newren@gmail.com> writes:

>> * ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits
> ...
>>  Ejected from 'seen', as it seems to fail its self-test.
>>  source: <pull.1080.v2.git.1638992395.gitgitgadget@gmail.com>
>
> I _think_ Stolee addressed this in his v3 cover letter with his
> comment that he also needed to merge with master[1].  

The topic is built on a merge of "ld/sparse-diff-blame" into "master",
so "also needed to merge with master" should be satisified already.

>> * pw/diff-color-moved-fix (2021-12-09) 15 commits
> ...
>>  Will merge to 'next'?
>>  source: <pull.981.v5.git.1639045809.gitgitgadget@gmail.com>
>
> Dscho seemed to suggest that course of action[2].  (I also looked at
> the series, though much more lightly -- I couldn't spot any problems.)
>
> [2] https://lore.kernel.org/git/nycvar.QRO.7.76.6.2112081329030.90@tvgsbejvaqbjf.bet/.

Yup, after giving it another look, I agree that this is ready.

Thanks.

tb/midx-bitmap-corruption-fix

[Taylor Blau]

On Fri, Dec 10, 2021 at 06:52:37PM -0800, Junio C Hamano wrote:
> * tb/midx-bitmap-corruption-fix (2021-12-08) 2 commits
>  - midx.c: make changing the preferred pack safe
>  - t5326: demonstrate bitmap corruption after permutation
>
>  A bug that made multi-pack bitmap and the object order out-of-sync
>  (hence the .midx data gets corrupted) has been fixed.
>
>  Will merge to 'next'?
>  source: <cover.1638991570.git.me@ttaylorr.com>

Let's wait. The patch does fix the bug, but somewhat accidentally. I
have a few proposed directions in the discussion beginning at:

  https://lore.kernel.org/git/YbOeEjNic5ETGcdy@nand.local/

but I want to hear from others before deciding on a direction.

Thanks,
Taylor

Re: tb/midx-bitmap-corruption-fix

[Junio C Hamano]

Taylor Blau <me@ttaylorr.com> writes:

> On Fri, Dec 10, 2021 at 06:52:37PM -0800, Junio C Hamano wrote:
>> * tb/midx-bitmap-corruption-fix (2021-12-08) 2 commits
>>  - midx.c: make changing the preferred pack safe
>>  - t5326: demonstrate bitmap corruption after permutation
>>
>>  A bug that made multi-pack bitmap and the object order out-of-sync
>>  (hence the .midx data gets corrupted) has been fixed.
>>
>>  Will merge to 'next'?
>>  source: <cover.1638991570.git.me@ttaylorr.com>
>
> Let's wait. The patch does fix the bug, but somewhat accidentally. I
> have a few proposed directions in the discussion beginning at:
>
>   https://lore.kernel.org/git/YbOeEjNic5ETGcdy@nand.local/
>
> but I want to hear from others before deciding on a direction.

Thanks.

ab/common-main-cleanup (was: What's cooking in git.git (Dec 2021, #03; Fri, 10))

[Ævar Arnfjörð Bjarmason]

On Fri, Dec 10 2021, Junio C Hamano wrote:

> * ab/common-main-cleanup (2021-12-07) 1 commit
>  - common-main.c: call exit(), don't return
>
>  Code clean-up.
>
>  Will merge to 'next'?
>  source: <patch-v2-1.1-4f52ecc94ba-20211207T101207Z-avarab@gmail.com>

That would be nice. The much smaller v2 addresses the comments you had,
and the change itself is relatively straightforward.

ab/only-single-progress-at-once (was: What's cooking in git.git (Dec 2021, #03; Fri, 10))

[Ævar Arnfjörð Bjarmason]

On Fri, Dec 10 2021, Junio C Hamano wrote:

> * ab/only-single-progress-at-once (2021-11-03) 8 commits
>  - progress.c: add & assert a "global_progress" variable
>  - various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
>  - pack-bitmap-write.c: don't return without stop_progress()
>  - progress.c: add temporary variable from progress struct
>  - progress.c tests: test some invalid usage
>  - progress.c tests: make start/stop commands on stdin
>  - progress.c test helper: add missing braces
>  - leak tests: fix a memory leaks in "test-progress" helper
>
>  Further tweaks on progress API.
>
>  Needs review.
>  The last three rounds has seen little reaction, even though earlier
>  round saw a lot of responses. The latest round needs a serious
>  review or at least Acks from past commentors.
>  source: <cover-v6-0.8-00000000000-20211102T122507Z-avarab@gmail.com>

I think less in "needs review" and more in needing a tiebreaker and/or
reply to my [1]. I.e. the ongoing discussion SZEDER and I have had about
the relative danger of adding this BUG() to this part of the code.

I think the best thing to do is just to merge it to "next".

Maybe I'm wrong about the BUG() not triggering in a way that someone
will spot if we expose this more widely.

But we've been having some version of that discussion for the past few
months without any any new specifics about *how* it might be raised,
just (I think it's fair to say) general paranoia that it might happen
somehow/somewhere.

Which is fair enough, but I'd think a good way forward with it would be
to give it wider exposure during this cycle. If it's triggered somehow
it's trivial to amend/revert the tip commit to remove the assertion.

If we merge it down I promise I'll (and try to remember to, putting it
in my calendar if so...) start some discussion before the next release
about whether we'll want to cut the release with that BUG(), which if we
don't trigger it by then we'll probably feel confident about keeping.

Does that sound like a good way forward? Otherwise the "one alternative
way forward[...]" mentioned in [1] is something we could do.

1. https://lore.kernel.org/git/211203.868rx2t0hv.gmgdl@evledraar.gmail.com/

Re: ab/only-single-progress-at-once

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Fri, Dec 10 2021, Junio C Hamano wrote:
>
>> * ab/only-single-progress-at-once (2021-11-03) 8 commits
>>  - progress.c: add & assert a "global_progress" variable
>>  - various *.c: use isatty(0|2), not isatty(STDIN_FILENO|STDERR_FILENO)
>>  - pack-bitmap-write.c: don't return without stop_progress()
>>  - progress.c: add temporary variable from progress struct
>>  - progress.c tests: test some invalid usage
>>  - progress.c tests: make start/stop commands on stdin
>>  - progress.c test helper: add missing braces
>>  - leak tests: fix a memory leaks in "test-progress" helper
>>
>>  Further tweaks on progress API.
>>
>>  Needs review.
>>  The last three rounds has seen little reaction, even though earlier
>>  round saw a lot of responses. The latest round needs a serious
>>  review or at least Acks from past commentors.
>>  source: <cover-v6-0.8-00000000000-20211102T122507Z-avarab@gmail.com>
>
> I think less in "needs review" and more in needing a tiebreaker and/or
> reply to my [1]. I.e. the ongoing discussion SZEDER and I have had about
> the relative danger of adding this BUG() to this part of the code.

I thought the BUG() thing has been already settled a few iteration
ago, but now you bring it up back, I read that part again.

In code that is directly about the correctness of the feature, I do
agree with the statement you made (paraphrasing---use of BUG() is
appropriate when we see a condition that should never trigger or our
code is buggy and not behaving the way we intended, and it is better
to stop before spreading the damage and eating user's data), but eye
candy like progress bars, I do not think it is end-user friendly to
kill the operation they started.  Of course, when they report a bug,
we may be able to say "please run with --no-progress to work it
around in the meantime" after thanking them for reporting, so it may
not be such a big deal either way.

> Which is fair enough, but I'd think a good way forward with it would be
> to give it wider exposure during this cycle. If it's triggered somehow
> it's trivial to amend/revert the tip commit to remove the assertion.
>
> If we merge it down I promise I'll (and try to remember to, putting it
> in my calendar if so...) start some discussion before the next release
> about whether we'll want to cut the release with that BUG(), which if we
> don't trigger it by then we'll probably feel confident about keeping.
>
> Does that sound like a good way forward? Otherwise the "one alternative
> way forward[...]" mentioned in [1] is something we could do.

I'm OK with marking it as "will cook in 'next'" to keep it longer
than usual, but I do not think merging down iffy code to 'next' or
even 'master' will give us better chance to expose the issue.  You
will not get a real-user feedback until it hits a release, which is
unfortunately way too late X-<.

ms/customizable-ident-expansion (was: What's cooking in git.git (Dec 2021, #03; Fri, 10))

[Ævar Arnfjörð Bjarmason]

On Fri, Dec 10 2021, Junio C Hamano wrote:

[CC-ing Maksym, the topic author]

> * ms/customizable-ident-expansion (2021-09-01) 1 commit
>  - keyword expansion: make "$Id$" string configurable
>
>  Instead of "$Id$", user-specified string (like $FreeBSD$) can be
>  used as an in-blob placeholder for keyword expansion.
>
>  Will discard.
>  Stalled for too long.
>  cf. <xmqqfsuosvrh.fsf@gitster.g>
>  cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
>  source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>

I'd like to see this go in, not because I'd personally find it useful,
but mainly because I didn't find anything wrong with it (per my review
id [1] linked above), and more importantly because the saga ending here
seems rather unfriendly to a first-time contributor.

Wasn't the "stalled for too long" mainly a victim of timing? I.e. that
it happened to be submitted/discussed around the end of the last release
cycle?

Maksym: Are you interested in pursuing this still?

I think per Junio's[2] an updated commit message describing some of the
use-case (and in particular how/why .gitattributes v.s. a git config
setting is needed) might be enough to help move this forward.

1. https://lore.kernel.org/git/211101.86fssf3bn3.gmgdl@evledraar.gmail.com/
2. https://lore.kernel.org/git/xmqqwnlito0b.fsf@gitster.g/

Re: ms/customizable-ident-expansion

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Fri, Dec 10 2021, Junio C Hamano wrote:
>
> [CC-ing Maksym, the topic author]
>
>> * ms/customizable-ident-expansion (2021-09-01) 1 commit
>>  - keyword expansion: make "$Id$" string configurable
>>
>>  Instead of "$Id$", user-specified string (like $FreeBSD$) can be
>>  used as an in-blob placeholder for keyword expansion.
>>
>>  Will discard.
>>  Stalled for too long.
>>  cf. <xmqqfsuosvrh.fsf@gitster.g>
>>  cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>
>>  source: <pull.1074.v3.git.git.1630462385587.gitgitgadget@gmail.com>
>
> I'd like to see this go in, not because I'd personally find it useful,
> but mainly because I didn't find anything wrong with it (per my review
> id [1] linked above), and more importantly because the saga ending here
> seems rather unfriendly to a first-time contributor.
>
> Wasn't the "stalled for too long" mainly a victim of timing? I.e. that
> it happened to be submitted/discussed around the end of the last release
> cycle?

I do not think timing has much to do with it.

I have been fairly clear from the very first review of the initial
iteration that I do not want us to commit to "per-path" attribute.
It will open can of worms [*], and paint us into a corner we cannot
get out of easily once such an overly flexible system gets to users'
hands.  I also was fairly clear that instead I'd expect it would be
more sensible if it were a single "instead of $Id$, use $FooId$
throughout the tree" configuration.

I also did not want to force a first-time contributor to commit to
deal with a fallout from such a design.  A new feature with a very
limited scope will have better chance to allow us extend it later
without breaking compatibility with the initial version and would be
better suited for first-timers.


[Footnote]

* I have already mentioned that users have to figure out when adding
  a new file which keyword applies to the path.  It also troubles me
  that it is not part of the design what should happen when people
  want to move files around.  Not allowing per-path settings means
  we do not have to worry about the extra flexibility hurting the
  users of this (not "customizable" part but the "ident replacement"
  as a whole) misguided feature that shouldn't have been added in
  the first place.

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Jeff Hostetler]

On 12/10/21 9:52 PM, Junio C Hamano wrote:
> 
> 
> * js/trace2-avoid-recursive-errors (2021-11-18) 1 commit
>    (merged to 'next' on 2021-12-02 at c5b1e5ddec)
>   + trace2: disable tr2_dst before warning on write errors
> 
>   trace2 error code path fix.
>   source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>

Sorry, I've been away from the list for a while.

I just noticed this is using "sigchain_push()" which might
be called from threaded code and could cause problems.

I think pthread_sigmask() would be a safer choice here.

I documented the reasons in compat/simple-ipc/ipc-unix-socket.c
in the header before "thread_block_sigpipe()".

Jeff

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Jeff Hostetler]

On 12/10/21 9:52 PM, Junio C Hamano wrote:
> [Cooking]
> 
> * jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
>   - t7527: test status with untracked-cache and fsmonitor--daemon
>   - fsmonitor: force update index after large responses
>   - fsmonitor--daemon: use a cookie file to sync with file system
>   - fsmonitor--daemon: periodically truncate list of modified files
>   - t/perf/p7519: add fsmonitor--daemon test cases
>   - t/perf/p7519: speed up test on Windows
>   - t/helper/test-chmtime: skip directories on Windows
>   - t/perf: avoid copying builtin fsmonitor files into test repo
>   - t7527: create test for fsmonitor--daemon
>   - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
>   - help: include fsmonitor--daemon feature flag in version info
>   - fsmonitor--daemon: implement handle_client callback
>   - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
>   - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
>   - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
>   - fsmonitor--daemon: create token-based changed path cache
>   - fsmonitor--daemon: define token-ids
>   - fsmonitor--daemon: add pathname classification
>   - fsmonitor--daemon: implement 'start' command
>   - fsmonitor--daemon: implement 'run' command
>   - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
>   - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
>   - fsmonitor--daemon: implement 'stop' and 'status' commands
>   - fsmonitor--daemon: add a built-in fsmonitor daemon
>   - fsmonitor: document builtin fsmonitor
>   - fsmonitor: use IPC to query the builtin FSMonitor daemon
>   - fsmonitor: config settings are repository-specific
>   - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
>   - fsmonitor: enhance existing comments
> 
>   Built-in fsmonitor (part 2).
> 
>   Expecting a reroll.
>   Seems that the discussion stalled.
>   cf. <d9c3ef61-768c-3560-2858-3438c355a742@jeffhostetler.com>
>   source: <pull.1041.v4.git.1634826309.gitgitgadget@gmail.com>

Sorry, $DayJob has had me diverted to other things and
I haven't had time to get back to this.

Yes, I owe you a reroll to address your last round of comments.
And then once I push that, I can update and push part 3.

I'm currently planning to work on these topics during the
Christmas holiday weeks.

Jeff

'Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)'

[Teng Long]

On Fri, 10 Dec 2021 18:52:37 -0800, Junio C Hamano wrote:

> * tl/ls-tree-oid-only (2021-11-22) 1 commit
>  - ls-tree.c: support `--oid-only` option for "git-ls-tree"
>
>  "git ls-tree" learns "--oid-only" option, similar to "--name-only".
>
>  Expecting a reroll.
>  source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>

Yes, you are right and the source is matched as Patch v3.

On 8 Dec 2021 10:08:30 +0800, I sent a patch v5 in ths series: 

https://public-inbox.org/git/cover.1638891420.git.dyroneteng@gmail.com/

Re: 'Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)'

[Junio C Hamano]

Teng Long <dyroneteng@gmail.com> writes:

> On Fri, 10 Dec 2021 18:52:37 -0800, Junio C Hamano wrote:
>
>> * tl/ls-tree-oid-only (2021-11-22) 1 commit
>>  - ls-tree.c: support `--oid-only` option for "git-ls-tree"
>>
>>  "git ls-tree" learns "--oid-only" option, similar to "--name-only".
>>
>>  Expecting a reroll.
>>  source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>
>
> Yes, you are right and the source is matched as Patch v3.
>
> On 8 Dec 2021 10:08:30 +0800, I sent a patch v5 in ths series: 
>
> https://public-inbox.org/git/cover.1638891420.git.dyroneteng@gmail.com/

Ah, thanks for a pointer.

It seems that it completely fell under everybody's radar.

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Phillip Wood]

Hi Junio

On 11/12/2021 02:52, Junio C Hamano wrote:
> * pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
>   - rebase -m: don't fork git checkout
>   - rebase --apply: set ORIG_HEAD correctly
>   - rebase --apply: fix reflog
>   - reset_head(): take struct rebase_head_opts
>   - rebase: cleanup reset_head() calls
>   - reset_head(): make default_reflog_action optional
>   - reset_head(): factor out ref updates
>   - create_autostash(): remove unneeded parameter
>   - reset_head(): remove action parameter
>   - rebase --apply: don't run post-checkout hook if there is an error
>   - rebase: do not remove untracked files on checkout
>   - rebase: pass correct arguments to post-checkout hook
>   - t5403: refactor rebase post-checkout hook tests
>   - rebase: factor out checkout for up to date branch
> 
>   Fix "some issues" in a helper function reset_head().
>   source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>

Thanks for your comments on this series, I'll re-roll but probably not 
until the new year now.

> * pw/diff-color-moved-fix (2021-12-09) 15 commits
>   - diff --color-moved: intern strings
>   - diff: use designated initializers for emitted_diff_symbol
>   - diff --color-moved-ws=allow-indentation-change: improve hash lookups
>   - diff --color-moved: stop clearing potential moved blocks
>   - diff --color-moved: shrink potential moved blocks as we go
>   - diff --color-moved: unify moved block growth functions
>   - diff --color-moved: call comparison function directly
>   - diff --color-moved-ws=allow-indentation-change: simplify and optimize
>   - diff: simplify allow-indentation-change delta calculation
>   - diff --color-moved: avoid false short line matches and bad zebra coloring
>   - diff --color-moved=zebra: fix alternate coloring
>   - diff --color-moved: rewind when discarding pmb
>   - diff --color-moved: factor out function
>   - diff --color-moved: clear all flags on blocks that are too short
>   - diff --color-moved: add perf tests
> 
>   Correctness and performance update to "diff --color-moved" feature.
> 
>   Will merge to 'next'?

I think it's ready, Dscho had a fairly detailed look at it and seemed 
happy, Elijah and Ævar read through previous versions. I'm not aware of 
any issues with it.

Best Wishes

Phillip

Re: What's cooking in git.git (Dec 2021, #03; Fri, 10)

[Junio C Hamano]

Phillip Wood <phillip.wood123@gmail.com> writes:

> On 11/12/2021 02:52, Junio C Hamano wrote:
>> * pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits
>>   - rebase -m: don't fork git checkout
>>   - rebase --apply: set ORIG_HEAD correctly
>>   - rebase --apply: fix reflog
>>   - reset_head(): take struct rebase_head_opts
>>   - rebase: cleanup reset_head() calls
>>   - reset_head(): make default_reflog_action optional
>>   - reset_head(): factor out ref updates
>>   - create_autostash(): remove unneeded parameter
>>   - reset_head(): remove action parameter
>>   - rebase --apply: don't run post-checkout hook if there is an error
>>   - rebase: do not remove untracked files on checkout
>>   - rebase: pass correct arguments to post-checkout hook
>>   - t5403: refactor rebase post-checkout hook tests
>>   - rebase: factor out checkout for up to date branch
>>   Fix "some issues" in a helper function reset_head().
>>   source: <pull.1049.v2.git.1638975481.gitgitgadget@gmail.com>
>
> Thanks for your comments on this series, I'll re-roll but probably not
> until the new year now.

Sure.  Thanks.

>
>> * pw/diff-color-moved-fix (2021-12-09) 15 commits
>>   - diff --color-moved: intern strings
>>   - diff: use designated initializers for emitted_diff_symbol
>>   - diff --color-moved-ws=allow-indentation-change: improve hash lookups
>>   - diff --color-moved: stop clearing potential moved blocks
>>   - diff --color-moved: shrink potential moved blocks as we go
>>   - diff --color-moved: unify moved block growth functions
>>   - diff --color-moved: call comparison function directly
>>   - diff --color-moved-ws=allow-indentation-change: simplify and optimize
>>   - diff: simplify allow-indentation-change delta calculation
>>   - diff --color-moved: avoid false short line matches and bad zebra coloring
>>   - diff --color-moved=zebra: fix alternate coloring
>>   - diff --color-moved: rewind when discarding pmb
>>   - diff --color-moved: factor out function
>>   - diff --color-moved: clear all flags on blocks that are too short
>>   - diff --color-moved: add perf tests
>>   Correctness and performance update to "diff --color-moved"
>> feature.
>>   Will merge to 'next'?
>
> I think it's ready, Dscho had a fairly detailed look at it and seemed
> happy, Elijah and Ævar read through previous versions. I'm not aware
> of any issues with it.

Yup, let's merge it down.  Thanks for these improvements.  They made
a pleasant read.

What's cooking in git.git (Oct 2021, #07; Fri, 29)

[Junio C Hamano]

Here are the topics that have been cooking in my tree.  Commits
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'.  The ones marked with '.' do not appear in any of the
integration branches, but I am still holding onto them.

Git 2.34-rc0 has been tagged.  There are still a few topics that
want to be in the upcoming release in 'next', but from here on,
let's concentrate more on fixes other than shiny new features.

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
repositories have only a subset of branches.

With maint, master, next, seen, todo:

	git://git.kernel.org/pub/scm/git/git.git/
	git://repo.or.cz/alt-git.git/
	https://kernel.googlesource.com/pub/scm/git/git/
	https://github.com/git/git/
	https://gitlab.com/git-vcs/git/

With all the integration branches and topics broken out:

	https://github.com/gitster/git/

Even though the preformatted documentation in HTML and man format
are not sources, they are published in these repositories for
convenience (replace "htmldocs" with "manpages" for the manual
pages):

	git://git.kernel.org/pub/scm/git/git-htmldocs.git/
	https://github.com/gitster/git-htmldocs.git/

Release tarballs are available at:

	https://www.kernel.org/pub/software/scm/git/

--------------------------------------------------
[Graduated to 'master']

* ab/fix-make-lint-docs (2021-10-27) 1 commit
  (merged to 'next' on 2021-10-27 at 04f0be2a8b)
 + Documentation/Makefile: fix lint-docs mkdir dependency

 Hotfix for a topic recently merged to 'master'.


* ab/make-sparse-for-real (2021-10-21) 1 commit
  (merged to 'next' on 2021-10-23 at f7a8389fb3)
 + Makefile: remove redundant GIT-CFLAGS dependency from "sparse"

 Fix-up for a recent topic.


* ab/plug-handle-path-exclude-leak (2021-10-21) 1 commit
  (merged to 'next' on 2021-10-23 at 6be5d7bea8)
 + config.c: don't leak memory in handle_path_include()

 Leakfix.


* ab/plug-random-leaks (2021-10-23) 6 commits
  (merged to 'next' on 2021-10-23 at 9c04a95718)
 + reflog: free() ref given to us by dwim_log()
 + submodule--helper: fix small memory leaks
 + clone: fix a memory leak of the "git_dir" variable
 + grep: fix a "path_list" memory leak
 + grep: use object_array_clear() in cmd_grep()
 + grep: prefer "struct grep_opt" over its "void *" equivalent

 Leakfix.


* ab/ref-filter-leakfix (2021-10-20) 3 commits
  (merged to 'next' on 2021-10-23 at 8066971a3d)
 + branch: use ref_sorting_release()
 + ref-filter API user: add and use a ref_sorting_release()
 + tag: use a "goto cleanup" pattern, leak less memory
 (this branch is used by jc/fix-ref-sorting-parse.)

 "git for-each-ref" family of commands were leaking the ref_sorting
 instances that hold sorting keys specified by the user; this has
 been corrected.


* ab/sh-retire-rebase-preserve-merges (2021-10-21) 2 commits
  (merged to 'next' on 2021-10-23 at f1fede7500)
 + git-sh-setup: remove messaging supporting --preserve-merges
 + git-sh-i18n: remove unused eval_ngettext()

 Code clean-up to remove unused helpers.


* ab/test-bail (2021-10-14) 2 commits
  (merged to 'next' on 2021-10-23 at 4a16ebdb74)
 + test-lib.sh: use "Bail out!" syntax on bad SANITIZE=leak use
 + test-lib.sh: de-duplicate error() teardown code

 A new feature has been added to abort early in the test framework.


* ab/unbundle-progress (2021-10-27) 1 commit
  (merged to 'next' on 2021-10-27 at a6ec5e5fb5)
 + git-bundle.txt: add missing words and punctuation

 Doc clarification.


* bs/archive-doc-compression-level (2021-10-25) 1 commit
  (merged to 'next' on 2021-10-25 at 9360d864a2)
 + archive: describe compression level option

 Update "git archive" documentation and give explicit mention on the
 compression level for both zip and tar.gz format.


* bs/doc-blame-color-lines (2021-10-20) 1 commit
  (merged to 'next' on 2021-10-23 at 4da10a5162)
 + git config doc: fix recent ASCIIDOC formatting regression

 Doc fix.


* cm/drop-xunsetenv (2021-10-29) 1 commit
  (merged to 'next' on 2021-10-29 at 3004dd0e66)
 + wrapper: remove xunsetenv()

 Drop a helper function that has never been used since its addition.


* jc/branch-copy-doc (2021-10-23) 1 commit
  (merged to 'next' on 2021-10-27 at efc3d30457)
 + branch (doc): -m/-c copies config and reflog

 "git branch -c/-m new old" was not described to copy config, which
 has been corrected.


* jk/http-push-status-fix (2021-10-18) 2 commits
  (merged to 'next' on 2021-10-23 at 9704ff261d)
 + transport-helper: recognize "expecting report" error from send-pack
 + send-pack: complain about "expecting report" with --helper-status

 "git push" client talking to an HTTP server did not diagnose the
 lack of the final status report from the other side correctly,
 which has been corrected.


* jk/log-warn-on-bogus-encoding (2021-10-29) 2 commits
  (merged to 'next' on 2021-10-29 at 7fa61a88f4)
 + log: document --encoding behavior on iconv() failure
 + Revert "logmsg_reencode(): warn when iconv() fails"

 Squelch over-eager warning message added during this cycle.


* js/expand-runtime-prefix (2021-10-25) 1 commit
  (merged to 'next' on 2021-10-25 at 7ff05e8222)
 + config.txt: fix typo

 Typofix.


* ks/submodule-add-message-fix (2021-10-27) 2 commits
  (merged to 'next' on 2021-10-27 at 4fc7c47990)
 + submodule: drop unused sm_name parameter from append_fetch_remotes()
  (merged to 'next' on 2021-10-25 at 377e759528)
 + submodule--helper: fix incorrect newlines in an error message

 Message regression fix.


* ma/doc-folder-to-directory (2021-10-25) 3 commits
  (merged to 'next' on 2021-10-27 at 99200092f7)
 + gitweb.txt: change "folder" to "directory"
 + gitignore.txt: change "folder" to "directory"
 + git-multi-pack-index.txt: change "folder" to "directory"

 Consistently use 'directory', not 'folder', to call the filesystem
 entity that collects a group of files and, eh, directories.


* ma/doc-git-version (2021-10-25) 1 commit
  (merged to 'next' on 2021-10-25 at 9f74afec0c)
 + git.txt: fix typo

 Typofix.


* mt/fix-add-rm-with-sparse-index (2021-10-28) 1 commit
  (merged to 'next' on 2021-10-29 at 06f21a49b1)
 + add, rm, mv: fix bug that prevents the update of non-sparse dirs

 Fix-up to a topic already merged to 'master'.


* re/completion-fix-test-equality (2021-10-28) 1 commit
  (merged to 'next' on 2021-10-29 at 78decd16a0)
 + completion: fix incorrect bash/zsh string equality check

 Fix long-standing shell syntax error in the completion script.


* sg/sparse-index-not-that-common-a-command (2021-10-25) 1 commit
  (merged to 'next' on 2021-10-27 at 020dc425a4)
 + command-list.txt: remove 'sparse-index' from main help

 Drop "git sparse-index" from the list of common commands.

--------------------------------------------------
[New Topics]

* ar/fix-git-pull-no-verify (2021-10-28) 1 commit
 - pull: honor --no-verify and do not call the commit-msg hook

 "git pull --no-verify" did not affect the underlying "git merge".

 Will merge to 'next'.


* if/redact-packfile-uri (2021-10-29) 2 commits
 - http-fetch: redact url on die() message
 - fetch-pack: redact packfile urls in traces

 Redact the path part of packfile URI that appears in the trace output.


* ar/no-verify-doc (2021-10-29) 1 commit
 - Document positive variant of commit and merge option "--no-verify"

 Doc update.

 Will merge to 'next'.


* ew/test-wo-fsync (2021-10-29) 1 commit
 - tests: disable fsync everywhere

 Allow running our tests while disabling internal fsync.


* ja/doc-cleanup (2021-10-28) 10 commits
 - init doc: --shared=0xxx does not give umask but perm bits
 - doc: git-init: clarify file modes in octal.
 - doc: git-http-push: describe the refs as pattern pairs
 - doc: uniformize <URL> placeholders' case
 - doc: use three dots for indicating repetition instead of star
 - doc: git-ls-files: express options as optional alternatives
 - doc: use only hyphens as word separators in placeholders
 - doc: express grammar placeholders between angle brackets
 - doc: split placeholders as individual tokens
 - doc: fix git credential synopsis

 Doc update.

 Will merge to 'next'.


* re/color-default-reset (2021-10-28) 3 commits
 - color: allow colors to be prefixed with "reset"
 - color: support "default" to restore fg/bg color
 - color: add missing GIT_COLOR_* white/black constants

 "default" and "reset" colors have been added to our palette.


* ab/test-lib (2021-10-29) 1 commit
  (merged to 'next' on 2021-10-29 at b3d23601bd)
 + t5310: drop lib-bundle.sh include

 Test (cosmetic) fix.

 Will merge to 'master'.


* jc/fix-first-object-walk (2021-10-29) 2 commits
 - docs: add headers in MyFirstObjectWalk
 - docs: fix places that break compilation in MyFirstObjectWalk

 Doc update.


* jc/unsetenv-returns-an-int (2021-10-29) 1 commit
 - unsetenv(3) returns int, not void

 The compatibility implementation for unsetenv(3) were written to
 mimic ancient, non-POSIX, variant seen in an old glibc; it has been
 changed to return an integer to match the more modern era.

 Will merge to 'next'.


* mc/clean-smudge-with-llp64 (2021-10-29) 8 commits
 - clean/smudge: allow clean filters to process extremely large files
 - odb: guard against data loss checking out a huge file
 - git-compat-util: introduce more size_t helpers
 - odb: teach read_blob_entry to use size_t
 - t1051: introduce a smudge filter test for extremely large files
 - test-lib: add prerequisite for 64-bit platforms
 - test-tool genzeros: generate large amounts of data more efficiently
 - test-genzeros: allow more than 2G zeros in Windows

--------------------------------------------------
[Stalled]

* mp/absorb-submodule-git-dir-upon-deinit (2021-10-07) 1 commit
 - submodule: absorb git dir instead of dying on deinit

 "git submodule deinit" for a submodule whose .git metadata
 directory is embedded in its working tree refused to work, until
 the submodule gets converted to use the "absorbed" form where the
 metadata directory is stored in superproject, and a gitfile at the
 top-level of the working tree of the submodule points at it.  The
 command is taught to convert such submodules to the absorbed form
 as needed.

 Expecting a reroll.
 cf. <xmqqwnmopqqk.fsf@gitster.g>


* ar/submodule-update (2021-10-13) 9 commits
 . submodule--helper: rename helper functions
 . submodule--helper: remove unused helpers
 . submodule: move core cmd_update() logic to C
 . submodule--helper: run update using child process struct
 . submodule--helper: allow setting superprefix for init_submodule()
 . submodule--helper: refactor get_submodule_displaypath()
 . submodule--helper: rename helpers for update-clone
 . submodule--helper: get remote names from any repository
 . submodule--helper: split up ensure_core_worktree()

 Rewrite of "git submodule update" in C.

 Kicked out of 'seen' to make room for es/superproject-aware-submodules
 which is among the topics this topic stomps on.


* 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.

 Getting tired of waiting for a reroll; will discard.

--------------------------------------------------
[Cooking]

* pw/diff-color-moved-fix (2021-10-27) 15 commits
 - diff --color-moved: intern strings
 - diff: use designated initializers for emitted_diff_symbol
 - diff --color-moved-ws=allow-indentation-change: improve hash lookups
 - diff --color-moved: stop clearing potential moved blocks
 - diff --color-moved: shrink potential moved blocks as we go
 - diff --color-moved: unify moved block growth functions
 - diff --color-moved: call comparison function directly
 - diff --color-moved-ws=allow-indentation-change: simplify and optimize
 - diff: simplify allow-indentation-change delta calculation
 - diff --color-moved: avoid false short line matches and bad zerba coloring
 - diff --color-moved=zebra: fix alternate coloring
 - diff --color-moved: rewind when discarding pmb
 - diff --color-moved: factor out function
 - diff --color-moved: clear all flags on blocks that are too short
 - diff --color-moved: add perf tests

 Long-overdue correctness and performance update to "diff
 --color-moved" feature.


* ab/generate-command-list (2021-10-23) 10 commits
 - generate-cmdlist.sh: replace "cut", "tr" and "grep" with pure-shell
 - generate-cmdlist.sh: replace "grep' invocation with a shell version
 - generate-cmdlist.sh: do not shell out to "sed"
 - generate-cmdlist.sh: stop sorting category lines
 - generate-cmdlist.sh: replace for loop by printf's auto-repeat feature
 - generate-cmdlist.sh: run "grep | sort", not "sort | grep"
 - generate-cmdlist.sh: don't call get_categories() from category_list()
 - generate-cmdlist.sh: spawn fewer processes
 - generate-cmdlist.sh: trivial whitespace change
 - command-list.txt: sort with "LC_ALL=C sort"

 Build optimization.

 Getting there.
 cf. <xmqqsfwr8j66.fsf@gitster.g>


* jc/fix-pull-ff-only-when-already-up-to-date (2021-10-29) 1 commit
  (merged to 'next' on 2021-10-29 at ad4753e668)
 + pull: --ff-only should make it a noop when already-up-to-date

 "git pull --ff-only" and "git pull --rebase --ff-only" should make
 it a no-op to attempt pulling from a remote that is behind us, but
 instead the command errored out by saying it was impossible to
 fast-forward, which may technically be true, but not a useful thing
 to diagnose as an error.  This has been corrected.

 Will cook in 'next'.


* ab/sh-retire-helper-functions (2021-10-21) 6 commits
 - git-sh-setup: remove "sane_grep", it's not needed anymore
 - git-sh-setup: remove unused sane_egrep() function
 - git-instaweb: unconditionally assume that gitweb is mod_perl capable
 - Makefile: remove $(NO_CURL) from $(SCRIPT_DEFINES)
 - Makefile: remove $(GIT_VERSION) from $(SCRIPT_DEFINES)
 - Makefile: move git-SCRIPT-DEFINES adjacent to $(SCRIPT_DEFINES)

 Make a few helper functions unused and then lose them.


* ow/stash-count-in-status-porcelain-output (2021-10-21) 2 commits
  (merged to 'next' on 2021-10-29 at 1a01b886e5)
 + status: print stash info with --porcelain=v2 --show-stash
 + status: count stash entries in separate function

 Allow "git status --porcelain=v2" to show the number of stash
 entries with --show-stash like the normal output does.

 Will cook in 'next'.


* tb/plug-pack-bitmap-leaks (2021-10-28) 9 commits
 - pack-bitmap.c: more aggressively free in free_bitmap_index()
 - pack-bitmap.c: don't leak type-level bitmaps
 - midx.c: write MIDX filenames to strbuf
 - builtin/multi-pack-index.c: don't leak concatenated options
 - builtin/repack.c: avoid leaking child arguments
 - builtin/pack-objects.c: don't leak memory via arguments
 - t/helper/test-read-midx.c: free MIDX within read_midx_file()
 - midx.c: don't leak MIDX from verify_midx_file
 - midx.c: clean up chunkfile after reading the MIDX

 Leakfix.

 Will merge to 'next'?


* es/pretty-describe-more (2021-10-29) 3 commits
 - pretty: add abbrev option to %(describe)
 - pretty: add tag option to %(describe)
 - pretty.c: rework describe options parsing for better extensibility

 Extend "git log --format=%(describe)" placeholder to allow passing
 selected command-line options to the underlying "git describe"
 command.


* fs/ssh-signing-key-lifetime (2021-10-27) 8 commits
 - ssh signing: make fmt-merge-msg consider key lifetime
 - ssh signing: make verify-tag consider key lifetime
 - ssh signing: make git log verify key lifetime
 - ssh signing: make verify-commit consider key lifetime
 - ssh signing: add key lifetime test prereqs
 - ssh signing: use sigc struct to pass payload
 - Merge branch 'fs/ssh-signing-fix' into fs/ssh-signing-key-lifetime
 - Merge branch 'fs/ssh-signing' into fs/ssh-signing-key-lifetime

 Extend the signing of objects with SSH keys and learn to pay
 attention to the key validity time range when verifying.


* jc/doc-format-patch-clarify-auto-base (2021-10-23) 1 commit
  (merged to 'next' on 2021-10-27 at 32c227324a)
 + format-patch (doc): clarify --base=auto

 Rephrase the description of "format-patch --base=auto".

 Will merge to 'master'.


* jc/doc-submitting-patches-choice-of-base (2021-10-25) 2 commits
 - (wip) reword the final review part
 - SubmittingPatchs: clarify choice of base and testing

 Extend the guidance to choose the base commit to build your work
 on, and hint/nudge contributors to read others' changes.


* rd/http-backend-code-simplification (2021-10-25) 1 commit
 - http-backend: remove a duplicated code branch

 (slight) Code simplification.

 Will merge to 'next'?


* gc/remote-with-fewer-static-global-variables (2021-10-28) 6 commits
 - remote: add struct repository parameter to external functions
 - remote: die if branch is not found in repository
 - remote: remove the_repository->remote_state from static methods
 - remote: use remote_state parameter internally
 - remote: move static variables into per-repository struct
 - t5516: add test case for pushing remote refspecs

 Code clean-up to eventually allow information on remotes defined
 for an arbitrary repository to be read.

 Will merge to 'next'?


* jk/loosen-urlmatch (2021-10-12) 1 commit
  (merged to 'next' on 2021-10-25 at f66ca39ebe)
 + urlmatch: add underscore to URL_HOST_CHARS

 Treat "_" as any other URL-valid characters in an URL when matching
 the per-URL configuration variable names.

 Will cook in 'next'.


* ab/config-based-hooks-2 (2021-10-20) 14 commits
 - run-command: remove old run_hook_{le,ve}() hook API
 - receive-pack: convert push-to-checkout hook to hook.h
 - read-cache: convert post-index-change to use hook.h
 - commit: convert {pre-commit,prepare-commit-msg} hook to hook.h
 - git-p4: use 'git hook' to run hooks
 - send-email: use 'git hook run' for 'sendemail-validate'
 - git hook run: add an --ignore-missing flag
 - merge: convert post-merge to use hook.h
 - hooks: convert 'post-checkout' hook to hook library
 - am: convert applypatch to use hook.h
 - rebase: convert pre-rebase to use hook.h
 - gc: use hook library for pre-auto-gc hook
 - hook: add 'run' subcommand
 - Merge branch 'ab/config-based-hooks-1' into ab/config-based-hooks-2

 More "config-based hooks".


* ab/ignore-replace-while-working-on-commit-graph (2021-10-15) 3 commits
  (merged to 'next' on 2021-10-25 at 5ed4266a96)
 + commit-graph: don't consider "replace" objects with "verify"
 + commit-graph tests: fix another graph_git_two_modes() helper
 + commit-graph tests: fix error-hiding graph_git_two_modes() helper
 (this branch is used by gc/use-repo-settings.)

 Teach "git commit-graph" command not to allow using replace objects
 at all, as we do not use the commit-graph at runtime when we see
 object replacement.

 Will merge to 'master'.


* so/stash-staged (2021-10-28) 2 commits
  (merged to 'next' on 2021-10-29 at 50335e8eeb)
 + stash: get rid of unused argument in stash_staged()
  (merged to 'next' on 2021-10-25 at 68b88e35c4)
 + stash: implement '--staged' option for 'push' and 'save'

 "git stash" learned the "--staged" option to stash away what has
 been added to the index (and nothing else).

 Will cook in 'next'.


* vd/sparse-sparsity-fix-on-read (2021-10-27) 3 commits
 - sparse-index: update do_read_index to ensure correct sparsity
 - sparse-index: add ensure_correct_sparsity function
 - test-read-cache.c: prepare_repo_settings after config init

 Ensure that the sparseness of the in-core index matches the
 index.sparse configuration specified by the repository immediately
 after the on-disk index file is read.

 Will merge to 'next'?


* jc/fix-ref-sorting-parse (2021-10-20) 2 commits
  (merged to 'next' on 2021-10-29 at e3ec6e8e77)
 + for-each-ref: delay parsing of --sort=<atom> options
 + Merge branch 'ab/ref-filter-leakfix' into jc/fix-ref-sorting-parse

 Things like "git -c branch.sort=bogus branch new HEAD", i.e. the
 operation modes of the "git branch" command that do not need the
 sort key information, no longer errors out by seeing a bogus sort
 key.

 Will cook in 'next'.


* jc/tutorial-format-patch-base (2021-10-23) 1 commit
  (merged to 'next' on 2021-10-29 at 67ff1a5a77)
 + MyFirstContribution: teach to use "format-patch --base=auto"

 Teach and encourage first-time contributors to this project to
 state the base commit when they submit their topic.

 Will cook in 'next'.


* js/branch-track-inherit (2021-10-18) 1 commit
 - branch: add flags and config to inherit tracking

 "git -c branch.autosetupmerge=inherit branch new old" makes "new"
 to have the same upstream as the "old" branch, instead of marking
 "old" itself as its upstream.

 Under discussion.
 cf. <87a6j6tbsv.fsf@gmgdl.gmail.com>


* jh/builtin-fsmonitor-part2 (2021-10-21) 29 commits
 - t7527: test status with untracked-cache and fsmonitor--daemon
 - fsmonitor: force update index after large responses
 - fsmonitor--daemon: use a cookie file to sync with file system
 - fsmonitor--daemon: periodically truncate list of modified files
 - t/perf/p7519: add fsmonitor--daemon test cases
 - t/perf/p7519: speed up test on Windows
 - t/helper/test-chmtime: skip directories on Windows
 - t/perf: avoid copying builtin fsmonitor files into test repo
 - t7527: create test for fsmonitor--daemon
 - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
 - help: include fsmonitor--daemon feature flag in version info
 - fsmonitor--daemon: implement handle_client callback
 - compat/fsmonitor/fsm-listen-darwin: implement FSEvent listener on MacOS
 - compat/fsmonitor/fsm-listen-darwin: add macos header files for FSEvent
 - compat/fsmonitor/fsm-listen-win32: implement FSMonitor backend on Windows
 - fsmonitor--daemon: create token-based changed path cache
 - fsmonitor--daemon: define token-ids
 - fsmonitor--daemon: add pathname classification
 - fsmonitor--daemon: implement 'start' command
 - fsmonitor--daemon: implement 'run' command
 - compat/fsmonitor/fsm-listen-darwin: stub in backend for Darwin
 - compat/fsmonitor/fsm-listen-win32: stub in backend for Windows
 - fsmonitor--daemon: implement 'stop' and 'status' commands
 - fsmonitor--daemon: add a built-in fsmonitor daemon
 - fsmonitor: document builtin fsmonitor
 - fsmonitor: use IPC to query the builtin FSMonitor daemon
 - fsmonitor: config settings are repository-specific
 - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
 - fsmonitor: enhance existing comments

 Built-in fsmonitor (part 2).


* ld/sparse-diff-blame (2021-10-27) 3 commits
 - blame: enable and test the sparse index
 - diff: enable and test the sparse index
 - Merge branch 'vd/sparse-reset' into ld/sparse-diff-blame
 (this branch uses vd/sparse-reset.)

 Teach diff and blame to work well with sparse index.

 Expecting a reroll.
 cf. <YXgpqJIS2OgOgS+k@nand.local>


* ns/remerge-diff (2021-10-27) 9 commits
 - doc/diff-options: explain the new --remerge-diff option
 - show, log: adapt Elijah Newren's changes to common tmp-objdir API
 - show, log: provide a --remerge-diff capability
 - merge-ort: capture and print ll-merge warnings in our preferred fashion
 - ll-merge: add API for capturing warnings in a strbuf instead of stderr
 - merge-ort: add ability to record conflict messages in a file
 - merge-ort: mark a few more conflict messages as omittable
 - Merge branch 'ns/tmp-objdir' into ns/remerge-diff
 - Merge branch 'ns/tmp-objdir' into ns/remerge-diff
 (this branch uses ns/tmp-objdir.)

 A new presentation for two-parent merge "--remerge-diff" can be
 used to show the difference between mechanical (and possibly
 conflicted) merge results and the recorded resolution.

 On hold.
 This is Elijah's remerge-diff rebased on ns/tmp-objdir to share the
 "create objects temporarily, only to discard without committing
 them to longer-term storage" infrastructure with another topic.


* ns/tmp-objdir (2021-10-27) 4 commits
  (merged to 'next' on 2021-10-27 at 001a18c0e1)
 + fixup! tmp-objdir: new API for creating temporary writable databases
 + fixup! tmp-objdir: new API for creating temporary writable databases
  (merged to 'next' on 2021-10-23 at 358d376f61)
 + tmp-objdir: disable ref updates when replacing the primary odb
 + tmp-objdir: new API for creating temporary writable databases
 (this branch is used by ns/batched-fsync and ns/remerge-diff.)

 New interface into the tmp-objdir API to help in-core use of the
 quarantine feature.

 On hold.
 cf. <xmqqo87auqda.fsf@gitster.g>


* vd/sparse-reset (2021-10-27) 8 commits
 - unpack-trees: improve performance of next_cache_entry
 - reset: make --mixed sparse-aware
 - reset: make sparse-aware (except --mixed)
 - reset: integrate with sparse index
 - reset: expand test coverage for sparse checkouts
 - sparse-index: update command for expand/collapse test
 - reset: preserve skip-worktree bit in mixed reset
 - reset: rename is_missing to !is_in_reset_tree
 (this branch is used by ld/sparse-diff-blame.)

 Various operating modes of "git reset" have been made to work
 better with the sparse index.

 Ready?


* gc/use-repo-settings (2021-10-15) 4 commits
  (merged to 'next' on 2021-10-25 at 3d38c09a8d)
 + gc: perform incremental repack when implictly enabled
 + fsck: verify multi-pack-index when implictly enabled
 + fsck: verify commit graph when implicitly enabled
 + Merge branch 'ab/ignore-replace-while-working-on-commit-graph' into gc/use-repo-settings
 (this branch uses ab/ignore-replace-while-working-on-commit-graph.)

 It is wrong to read some settings directly from the config
 subsystem, as things like feature.experimental can affect their
 default values.

 Will merge to 'master'.


* pw/fix-some-issues-in-reset-head (2021-10-01) 12 commits
 - rebase -m: don't fork git checkout
 - rebase --apply: set ORIG_HEAD correctly
 - rebase --apply: fix reflog
 - reset_head(): take struct rebase_head_opts
 - rebase: cleanup reset_head() calls
 - reset_head(): make default_reflog_action optional
 - reset_head(): factor out ref updates
 - reset_head(): remove action parameter
 - reset_head(): don't run checkout hook if there is an error
 - reset_head(): fix checkout
 - rebase: factor out checkout for up to date branch
 - Merge branch 'pw/rebase-of-a-tag-fix' into pw/fix-some-issues-in-reset-head

 Fix "some issues" in a helper function reset_head().

 Expecting a reroll.
 Needs a lot better explanation, including what the issues are,
 which codepaths the helper is used and to do what, and tests to
 protect the fixes.


* es/superproject-aware-submodules (2021-10-14) 4 commits
 - submodule: record superproject gitdir during 'update'
 - submodule: record superproject gitdir during absorbgitdirs
 - introduce submodule.superprojectGitDir record
 - t7400-submodule-basic: modernize inspect() helper

 A configuration variable in a submodule points at the location of
 the superproject it is bound to (RFC).

 Under discussion.
 cf. <911ab2c1-8a11-d9d0-4b28-fc801112f6da@gmail.com>


* tp/send-email-completion (2021-10-28) 2 commits
 - send-email docs: add format-patch options
 - send-email: programmatically generate bash completions

 The command line complation for "git send-email" options have been
 tweaked to make it easier to keep it in sync with the command itself.

 Will merge to 'next'?


* hm/paint-hits-in-log-grep (2021-10-15) 4 commits
  (merged to 'next' on 2021-10-25 at e3edea3fa9)
 + grep/pcre2: fix an edge case concerning ascii patterns and UTF-8 data
 + pretty: colorize pattern matches in commit messages
 + grep: refactor next_match() and match_one_pattern() for external use
 + Merge branch 'jk/grep-haystack-is-read-only' into hm/paint-hits-in-log-grep

 "git log --grep=string --author=name" learns to highlight hits just
 like "git grep string" does.

 Will merge to 'master'.


* ns/batched-fsync (2021-10-27) 9 commits
  (merged to 'next' on 2021-10-27 at eb2a3afdd1)
 + Merge branch 'ns/tmp-objdir' into ns/batched-fsync
  (merged to 'next' on 2021-10-25 at e45c907d41)
 + core.fsyncobjectfiles: performance tests for add and stash
 + core.fsyncobjectfiles: tests for batch mode
 + unpack-objects: use the bulk-checkin infrastructure
 + update-index: use the bulk-checkin infrastructure
 + core.fsyncobjectfiles: add windows support for batch mode
 + core.fsyncobjectfiles: batched disk flushes
 + bulk-checkin: rename 'state' variable and separate 'plugged' boolean
 + Merge branch 'ns/tmp-objdir' into ns/batched-fsync
 (this branch uses ns/tmp-objdir.)

 The "core.fsyncobjectfiles" configuration variable can now be set
 to "batch" for improved performance.

 On hold.
 cf. <xmqqo87auqda.fsf@gitster.g>


* en/zdiff3 (2021-09-20) 2 commits
 - update documentation for new zdiff3 conflictStyle
 - xdiff: implement a zealous diff3, or "zdiff3"

 "Zealous diff3" style of merge conflict presentation has been added.


* js/scalar (2021-10-27) 15 commits
 - scalar: accept -C and -c options before the subcommand
 - scalar: implement the `version` command
 - scalar: implement the `delete` command
 - scalar: teach 'reconfigure' to optionally handle all registered enlistments
 - scalar: allow reconfiguring an existing enlistment
 - scalar: implement the `run` command
 - scalar: teach 'clone' to support the --single-branch option
 - scalar: implement the `clone` subcommand
 - scalar: implement 'scalar list'
 - scalar: let 'unregister' handle a deleted enlistment directory gracefully
 - scalar: 'unregister' stops background maintenance
 - scalar: 'register' sets recommended config and starts maintenance
 - scalar: create test infrastructure
 - scalar: start documenting the command
 - scalar: create a rudimentary executable

 Add pieces from "scalar" to contrib/.

 What's the status of this thing?


* ms/customizable-ident-expansion (2021-09-01) 1 commit
 - keyword expansion: make "$Id$" string configurable

 Instead of "$Id$", user-specified string (like $FreeBSD$) can be
 used as an in-blob placeholder for keyword expansion.

 What's the status of this one?  Meh?


* ab/refs-errno-cleanup (2021-10-16) 21 commits
  (merged to 'next' on 2021-10-29 at 3f57147176)
 + refs API: post-migration API renaming [2/2]
 + refs API: post-migration API renaming [1/2]
 + refs API: don't expose "errno" in run_transaction_hook()
 + refs API: make expand_ref() & repo_dwim_log() not set errno
 + refs API: make resolve_ref_unsafe() not set errno
 + refs API: make refs_ref_exists() not set errno
 + refs API: make refs_resolve_refdup() not set errno
 + refs tests: ignore ignore errno in test-ref-store helper
 + refs API: ignore errno in worktree.c's find_shared_symref()
 + refs API: ignore errno in worktree.c's add_head_info()
 + refs API: make files_copy_or_rename_ref() et al not set errno
 + refs API: make loose_fill_ref_dir() not set errno
 + refs API: make resolve_gitlink_ref() not set errno
 + refs API: remove refs_read_ref_full() wrapper
 + refs/files: remove "name exist?" check in lock_ref_oid_basic()
 + reflog tests: add --updateref tests
 + refs API: make refs_rename_ref_available() static
 + refs API: make parse_loose_ref_contents() not set errno
 + refs API: make refs_read_raw_ref() not set errno
 + refs API: add a version of refs_resolve_ref_unsafe() with "errno"
 + branch tests: test for errno propagating on failing read

 The "remainder" of hn/refs-errno-cleanup topic.

 Will cook in 'next'.


* ab/only-single-progress-at-once (2021-10-27) 8 commits
 - progress.c: add & assert a "global_progress" variable
 - various *.c: use isatty(1|2), not isatty(STDIN_FILENO|STDERR_FILENO)
 - pack-bitmap-write.c: don't return without stop_progress()
 - progress.c: add temporary variable from progress struct
 - progress.c tests: test some invalid usage
 - progress.c tests: make start/stop commands on stdin
 - progress.c test helper: add missing braces
 - leak tests: fix a memory leaks in "test-progress" helper

 Further tweaks on progress API.

 Correction of the course may be required?
 cf. <211025.8635opi8om.gmgdl@evledraar.gmail.com>
 cf. <cover-v4-0.8-00000000000-20211025T111915Z-avarab@gmail.com>


* hn/reftable (2021-10-08) 19 commits
 - Add "test-tool dump-reftable" command.
 - reftable: add dump utility
 - reftable: implement stack, a mutable database of reftable files.
 - reftable: implement refname validation
 - reftable: add merged table view
 - reftable: add a heap-based priority queue for reftable records
 - reftable: reftable file level tests
 - reftable: read reftable files
 - reftable: generic interface to tables
 - reftable: write reftable files
 - reftable: a generic binary tree implementation
 - reftable: reading/writing blocks
 - Provide zlib's uncompress2 from compat/zlib-compat.c
 - reftable: (de)serialization for the polymorphic record type.
 - reftable: add blocksource, an abstraction for random access reads
 - reftable: utility functions
 - reftable: add error related functionality
 - reftable: add LICENSE
 - hash.h: provide constants for the hash IDs

 The "reftable" backend for the refs API, without integrating into
 the refs subsystem.

--------------------------------------------------
[Discarded]

* en/remerge-diff (2021-08-31) 7 commits
 . doc/diff-options: explain the new --remerge-diff option
 . show, log: provide a --remerge-diff capability
 . tmp-objdir: new API for creating and removing primary object dirs
 . merge-ort: capture and print ll-merge warnings in our preferred fashion
 . ll-merge: add API for capturing warnings in a strbuf instead of stderr
 . merge-ort: add ability to record conflict messages in a file
 . merge-ort: mark a few more conflict messages as omittable

 A new presentation for two-parent merge "--remerge-diff" can be
 used to show the difference between mechanical (and possibly
 conflicted) merge results and the recorded resolution.


* rb/doc-commit-header-continuation-line (2021-10-11) 1 commit
 . signature-format.txt: add space to fix gpgsig continuation line

 Values in the header portion of commit object can be multi-lined
 by a single SP indentation of the second and subsequent lines, and
 this applies to an empty line as well.  Update an example in the
 technical documentation to highlight it.

 Superseded by the jc/doc-commit-header-continuation-line topic.

ms/customizable-ident-expansion (was: What's cooking in git.git (Oct 2021, #07; Fri, 29))

[Ævar Arnfjörð Bjarmason]

On Fri, Oct 29 2021, Junio C Hamano wrote:

> * ms/customizable-ident-expansion (2021-09-01) 1 commit
>  - keyword expansion: make "$Id$" string configurable
>
>  Instead of "$Id$", user-specified string (like $FreeBSD$) can be
>  used as an in-blob placeholder for keyword expansion.
>
>  What's the status of this one?  Meh?

I reviewed this the other day, but that review didn't yield a mailing
list message.

I think some of the seeming re-invention of "struct strbuf" is a bit
nasty, but in trying to see if I could replace it I came to head with
existing code that this was extending, so it's nothing new.

But as for the feature it's clearly useful to some, and helps SCM
inter-op, so even if I'm also rather "meh" on it I think it would be
good to merge it down, it's clearly very useful to its (small) target
audience, and doesn't seem to be harming anything else.

Re: ms/customizable-ident-expansion

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> But as for the feature it's clearly useful to some, and helps SCM
> inter-op, so even if I'm also rather "meh" on it I think it would be
> good to merge it down, it's clearly very useful to its (small) target
> audience, and doesn't seem to be harming anything else.

I do not care too much how small the audiences are.

The part I do not agree with the most with this is that this allows
the placeholder specified per path (because it is built with the
attributes, not the configuration, mechanism).  "Use this token
instead of 'Id'" command line option with a configuration variable
would not have had such an issue.

Re: ms/customizable-ident-expansion

[Ævar Arnfjörð Bjarmason]

On Sun, Nov 07 2021, Maksym Sobolyev wrote:

> Junio, well it works and passes Occam Razor test. I even added a
> reasonable number of test cases. As I tried to explain at least once,
> having it per-directory might be advantageous, if the project pulls
> sources from all different places where you might "mute" ID
> replacement for certain parts of the tree or use a different one. Most
> of that would have to be thrown away if the feature is to be reworked
> to your liking.

Yes, isn't there also a practical use for this in the source trees of
the various *BSDs who import each other's sources (but I don't know if
it's useful for that).

> Totay I logged into one of our products and got this message:
>
> + sudo chroot /voicelog/src su -l sobomax
> This fortune brought to you by:
> $FreeBSD: 3325fdce090fbf738dcb1f8535d16217789cbe4e $
>
> I did not know such a fortune ever existed, it has probably been
> developed around a long-long time ago before git or even linux
> existed. Just as many other more useful features around the same idea.

This on the other hand looks both neat and a bit scary, so something
that previously left "$FreeBSD$" alone started expanding it? Hrm, I
guess since you need to set "ident" it's no big deal.

But I wonder if we'll see any downstream breakage for people who opt-in
to this, who have code they didn't know about that expects an RCS/CVS
version, and suddenly gets a SHA-1-sized hex string instead :)

Re: ms/customizable-ident-expansion

[Junio C Hamano]

Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:

> On Sun, Nov 07 2021, Maksym Sobolyev wrote:
>
>> Junio, well it works and passes Occam Razor test. I even added a
>> reasonable number of test cases. As I tried to explain at least once,
>> having it per-directory might be advantageous, if the project pulls
>> sources from all different places where you might "mute" ID
>> replacement for certain parts of the tree or use a different one. Most
>> of that would have to be thrown away if the feature is to be reworked
>> to your liking.
>
> Yes, isn't there also a practical use for this in the source trees of
> the various *BSDs who import each other's sources (but I don't know if
> it's useful for that).

What are the users trying to record with that, though?  If FreeBSD
source tree wants to keep the sign that some things originated from
OpenBSD, wouldn't they want to keep the OpenBSD marking intact?  At
that point, storing $OpenBSD$ and expanding to $OpenBSD: <blob>$ is
not what they want, as the object name will keep changing.

Also, these users need to be aware which path uses what identifier
by looking at .gitattributes and what the ident attribute says.  If
you add $Id$ to a new file, but the .gitattribute entry that covers
it says $FreeBSD$ will be the one expanded for that file, nothing
will happen until you realize your mistake.  I am hesitant to adopt
that proposal because dealing with that kind of confusion is not
something worth spending time of developers (I mean those who have
to figure out and decide between $Id$ and $FreeBSD$, not the
developer cycle of Git project).

So...