What's cooking in git.git (Sep 2021, #02; Wed, 8)

What's cooking in git.git (Sep 2021, #02; Wed, 8)

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

We have too many topics in flight that haven't been adequately
looked at.  I may start discarding too ancient topics to nudge
the authors to resubmit updates to them.

But a good news (at least for me) is that I have a lot more topics
than in the previous issue of this report that are marked for
merging down ;-).

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']

* cb/ci-use-upload-artifacts-v1 (2021-08-15) 1 commit
  (merged to 'next' on 2021-08-24 at afdbb7ee8d)
 + ci: use upload-artifacts v1 for dockerized jobs

 Use upload-artifacts v1 (instead of v2) for 32-bit linux, as the
 new version has a blocker bug for that architecture.


* fc/completion-updates (2021-08-18) 4 commits
  (merged to 'next' on 2021-08-24 at 593cd75c64)
 + completion: bash: add correct suffix in variables
 + completion: bash: fix for multiple dash commands
 + completion: bash: fix for suboptions with value
 + completion: bash: fix prefix detection in branch.*

 Command line completion updates.


* jk/commit-edit-fixup-fix (2021-08-15) 1 commit
  (merged to 'next' on 2021-08-24 at 0c625438c3)
 + commit: restore --edit when combined with --fixup

 "git commit --fixup" now works with "--edit" again, after it was
 broken in v2.32.


* ps/connectivity-optim (2021-08-09) 5 commits
  (merged to 'next' on 2021-08-24 at 94a7a04ca4)
 + revision: avoid hitting packfiles when commits are in commit-graph
 + commit-graph: split out function to search commit position
 + revision: stop retrieving reference twice
 + connected: do not sort input revisions
 + revision: separate walk and unsorted flags

 The revision traversal API has been optimized by taking advantage
 of the commit-graph, when available, to determine if a commit is
 reachable from any of the existing refs.


* pw/rebase-r-fixes (2021-08-23) 4 commits
  (merged to 'next' on 2021-08-24 at 81c6aff70a)
 + rebase -r: fix merge -c with a merge strategy
 + rebase -r: don't write .git/MERGE_MSG when fast-forwarding
 + rebase -i: add another reword test
 + rebase -r: make 'merge -c' behave like reword

 Various bugs in "git rebase -r" have been fixed.


* pw/rebase-skip-final-fix (2021-08-13) 3 commits
  (merged to 'next' on 2021-08-24 at 73ec41e9dd)
 + rebase --continue: remove .git/MERGE_MSG
 + rebase --apply: restore some tests
 + t3403: fix commit authorship

 Checking out all the paths from HEAD during the last conflicted
 step in "git rebase" and continuing would cause the step to be
 skipped (which is expected), but leaves MERGE_MSG file behind in
 $GIT_DIR and confuses the next "git commit", which has been
 corrected.


* sg/make-fix-ar-invocation (2021-08-19) 1 commit
  (merged to 'next' on 2021-08-24 at 9a3df9ec56)
 + Makefile: remove archives before manipulating them with 'ar'

 Build fix.


* ti/tcsh-completion-regression-fix (2021-08-18) 1 commit
  (merged to 'next' on 2021-08-24 at 8fa66cf037)
 + completion: tcsh: Fix regression by drop of wrapper functions

 Update to the command line completion (in contrib/) for tcsh.

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

* bs/install-strip (2021-09-05) 1 commit
 - make: add INSTALL_STRIP option variable

 "make INSTALL_STRIP=-s install" allows the installation step to use
 "install -s" to strip the binaries as they get installed.

 Will merge to 'next'.


* cb/pedantic-build-for-developers (2021-09-03) 3 commits
 - developer: enable pedantic by default
 - win32: allow building with pedantic mode enabled
 - gettext: remove optional non-standard parens in N_() definition

 Update the build procedure to use the "-pedantic" build when
 DEVELOPER makefile macro is in effect.

 Will merge to 'next'?


* js/scalar (2021-09-03) 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/.


* ps/update-ref-batch-flush (2021-09-03) 1 commit
 - update-ref: fix streaming of status updates

 "git update-ref --stdin" failed to flush its output as needed,
 which potentially led the conversation to a deadlock.

 Will merge to 'next'?


* ab/no-more-check-bindir (2021-09-07) 1 commit
 - Makefile: remove the check_bindir script

 Build simplification.

 Will merge to 'next'.


* ab/send-email-config-fix (2021-09-07) 1 commit
 - send-email: fix a "first config key wins" regression in v2.33.0

 Regression fix.

 Will merge to 'next' and then to 'master'.


* ab/tr2-leaks-and-fixes (2021-09-07) 6 commits
 - tr2: log N parent process names on Linux
 - tr2: do compiler enum check in trace2_collect_process_info()
 - tr2: leave the parent list empty upon failure & don't leak memory
 - tr2: stop leaking "thread_name" memory
 - tr2: clarify TRACE2_PROCESS_INFO_EXIT comment under Linux
 - tr2: remove NEEDSWORK comment for "non-procfs" implementations

 The tracing of process ancestry information has been enhanced.

 Will merge to 'next'.


* bs/doc-bugreport-outdir (2021-09-07) 1 commit
 - Documentation: fix default directory of git bugreport -o

 Docfix.

 Will merge to 'next'.


* jc/prefix-filename-allocates (2021-09-07) 1 commit
 - hash-object: prefix_filename() returns allocated memory these days

 Leakfix.

 Will merge to 'next'?


* kr/doc-webserver-config-for-v2 (2021-09-07) 1 commit
 - Docs: web server must setenv GIT_PROTOCOL for v2

 Hints to set GIT_PROTOCOL environment in various CGI environments
 are added to the documentation.

 Will merge to 'next'?


* rs/range-diff-avoid-segfault-with-I (2021-09-07) 1 commit
 - range-diff: avoid segfault with -I

 "git range-diff -I... <range> <range>" segfaulted, which has been
 corrected.

 Will merge to 'next'?


* so/diff-index-regression-fix (2021-09-07) 1 commit
 - diff-index: restore -c/--cc options handling

 Recent "diff -m" changes broke "gitk", which has been corrected.

 Will merge to 'next' and then to 'master'.


* tb/pack-finalize-ordering (2021-09-07) 2 commits
 - builtin/repack.c: move `.idx` files into place last
 - pack-write.c: rename `.idx` file into place last

 The order in which various files that make up a single (conceptual)
 packfile has been reevaluated and straightened up.  This matters in
 correctness, as an incomplete set of files must not be shown to a
 running Git.

 Will merge to 'next'?


* ab/reverse-midx-optim (2021-09-07) 1 commit
 - pack-write: skip *.rev work when not writing *.rev


* ab/sanitize-leak-ci (2021-09-07) 3 commits
 - tests: add a test mode for SANITIZE=leak, run it in CI
 - CI: refactor "if" to "case" statement
 - Makefile: add SANITIZE=leak flag to GIT-BUILD-OPTIONS

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

* es/config-based-hooks (2021-08-19) 7 commits
 - hook: allow out-of-repo 'git hook' invocations
 - hook: include hooks from the config
 - hook: allow running non-native hooks
 - hook: introduce "git hook list"
 - hook: allow parallel hook execution
 - hook: run a list of hooks instead
 - Merge branch 'ab/config-based-hooks-base' into es/config-based-hooks
 (this branch uses ab/config-based-hooks-base.)

 Revamp the hooks subsystem to allow multiple of them to trigger
 upon the same event and control via the configuration variables.

 Expecting a reroll
 but ab/config-based-hooks-base needs to be in a better shape first.
 cf. <87v93wflm0.fsf@evledraar.gmail.com>
 cf. <87tuj7xhqo.fsf@evledraar.gmail.com>


* jh/builtin-fsmonitor (2021-09-03) 37 commits
 - fixup! fsmonitor--daemon: implement handle_client callback
 - SQUASH??? https://github.com/git/git/runs/3438543601?check_suite_focus=true#step:5:136
 - BANDAID: sparse fixes
 - t7527: test FS event reporing on MacOS WRT case and Unicode
 - fsmonitor: handle shortname for .git
 - t7527: test status with untracked-cache and fsmonitor--daemon
 - fsmonitor: force update index after large responses
 - fsmonitor: enhance existing comments
 - fsmonitor--daemon: use a cookie file to sync with file system
 - fsmonitor--daemon: periodically truncate list of modified files
 - t7527: create test for fsmonitor--daemon
 - t/perf/p7519: add fsmonitor--daemon test cases
 - t/perf: avoid copying builtin fsmonitor files into test repo
 - t/perf/p7519: speed up test using "test-tool touch"
 - t/helper/test-touch: add helper to touch a series of files
 - fsmonitor--daemon: implement handle_client callback
 - fsmonitor-fs-listen-macos: implement FSEvent listener on MacOS
 - fsmonitor-fs-listen-macos: add macos header files for FSEvent
 - fsmonitor-fs-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: do not try to operate on bare repos
 - fsmonitor--daemon: implement 'start' command
 - fsmonitor--daemon: implement 'run' command
 - fsmonitor-fs-listen-macos: stub in backend for MacOS
 - fsmonitor-fs-listen-win32: stub in backend for Windows
 - t/helper/fsmonitor-client: create IPC client to talk to FSMonitor Daemon
 - fsmonitor--daemon: implement 'stop' and 'status' commands
 - fsmonitor--daemon: add a built-in fsmonitor daemon
 - fsmonitor: use IPC to query the builtin FSMonitor daemon
 - fsmonitor: config settings are repository-specific
 - help: include fsmonitor--daemon feature flag in version info
 - fsmonitor-ipc: create client routines for git-fsmonitor--daemon
 - fsmonitor--daemon: update fsmonitor documentation
 - fsmonitor--daemon: man page
 - simple-ipc: preparations for supporting binary messages.

 An attempt to write and ship with a watchman equivalent tailored
 for our use.

 Expecting a reroll post 2.33 release.


* es/superproject-aware-submodules (2021-08-19) 5 commits
 - fixup! introduce submodule.superprojectGitDir record
 - 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).

 Looking good.


* en/zdiff3 (2021-06-15) 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.

 Expecting a reroll.
 cf. <CABPp-BE7-E03+x38EK-=AE5mwwdST+d50hiiud2eY2Nsf3rM5g@mail.gmail.com>


* ao/p4-avoid-decoding (2021-04-12) 2 commits
 - git-p4: do not decode data from perforce by default
 - git-p4: avoid decoding more data from perforce

 "git p4" in Python-2 days used to accept a lot more kinds of data
 from Perforce server as uninterrupted byte sequence, but after
 switching to Python-3, too many things are expected to be in UTF-8,
 which broke traditional use cases.

 Waiting for reviews.


* tv/p4-fallback-encoding (2021-04-30) 1 commit
 - git-p4: git-p4.fallbackEncoding to specify non UTF-8 charset

 "git p4" learns the fallbackEncoding configuration variable to
 safely accept changeset descriptions that aren't written in UTF-8.

 Waiting for reviews.


* ab/fsck-unexpected-type (2021-09-07) 22 commits
 - fsck: report invalid object type-path combinations
 - fsck: report invalid types recorded in objects
 - object-store.h: move read_loose_object() below 'struct object_info'
 - fsck: don't hard die on invalid object types
 - object-file.c: use "enum" return type for unpack_loose_header()
 - object-file.c: return -2 on "header too long" in unpack_loose_header()
 - object-file.c: return -1, not "status" from unpack_loose_header()
 - object-file.c: guard against future bugs in loose_object_info()
 - object-file.c: stop dying in parse_loose_header()
 - object-file.c: split up ternary in parse_loose_header()
 - object-file.c: simplify unpack_loose_short_header()
 - object-file.c: add missing braces to loose_object_info()
 - object-file.c: make parse_loose_header_extended() public
 - object-file.c: don't set "typep" when returning non-zero
 - cache.h: move object functions to object-store.h
 - cat-file tests: test for current --allow-unknown-type behavior
 - cat-file tests: add corrupt loose object test
 - rev-list tests: test for behavior with invalid object types
 - cat-file tests: test that --allow-unknown-type isn't on by default
 - cat-file tests: test for missing object with -t and -s
 - fsck tests: add test for fsck-ing an unknown type
 - fsck tests: refactor one test to use a sub-repo

 "git fsck" has been taught to report mismatch between expected and
 actual types of an object better.

 Needs review.

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

* jc/trivial-threeway-binary-merge (2021-09-05) 1 commit
 - apply: resolve trivial merge without hitting ll-merge with "--3way"

 The "git apply -3" code path learned not to bother the lower level
 merge machinery when the three-way merge can be trivially resolved
 without the content level merge.

 Will merge to 'next'.


* gh/gitweb-branch-sort (2021-06-10) 1 commit
 - gitweb: use HEAD as secondary sort key in git_get_heads_list()

 Tie-break branches that point at the same object in the list of
 branches on GitWeb to show the one pointed at by HEAD early.

 Will merge to 'next'.


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


* pb/test-use-user-env (2021-09-07) 3 commits
 - test-lib-functions: keep user's debugger config files and TERM in 'debug'
 - test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'
 - test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'

 Teach test_pause and test_debug to allow using the HOME and TERM
 environment variables the user usually uses.

 Will merge to 'next'?


* js/retire-preserve-merges (2021-09-07) 11 commits
 - sequencer: restrict scope of a formerly public function
 - rebase: remove a no-longer-used function
 - rebase: stop mentioning the -p option in comments
 - rebase: remove obsolete code comment
 - rebase: drop the internal `rebase--interactive` command
 - git-svn: drop support for `--preserve-merges`
 - rebase: drop support for `--preserve-merges`
 - pull: remove support for `--rebase=preserve`
 - tests: stop testing `git rebase --preserve-merges`
 - remote: warn about unhandled branch.<name>.rebase values
 - t5520: do not use `pull.rebase=preserve`

 The "--preserve-merges" option of "git rebase" has been removed.

 Will merge to 'next'?


* cb/remote-ndebug-fix (2021-09-02) 1 commit
  (merged to 'next' on 2021-09-03 at a47f44ca9d)
 + remote: avoid -Wunused-but-set-variable in gcc with -DNDEBUG

 Build fix.

 Will merge to 'master'.


* mr/bisect-in-c-4 (2021-09-02) 6 commits
 - bisect--helper: retire `--bisect-next-check` subcommand
 - bisect--helper: reimplement `bisect_run` shell
 - bisect--helper: reimplement `bisect_visualize()`shell function in C
 - run-command: make `exists_in_PATH()` non-static
 - t6030-bisect-porcelain: add test for bisect visualize
 - t6030-bisect-porcelain: add tests to control bisect run exit cases

 Rewrite of "git bisect" in C continues.


* tb/add-objects-in-unpacked-packs-simplify (2021-08-29) 3 commits
  (merged to 'next' on 2021-09-01 at 66b0f8564d)
 + builtin/pack-objects.c: remove duplicate hash lookup
 + builtin/pack-objects.c: simplify add_objects_in_unpacked_packs()
 + object-store.h: teach for_each_packed_object to ignore kept packs

 Code simplification with reduced memory usage.

 Will merge to 'master'.


* es/walken-tutorial-fix (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at 73719bee8a)
 + doc: fix syntax error and the format of printf

 Typofix.

 Will merge to 'master'.


* jh/sparse-index-resize-fix (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at 5ee2615670)
 + sparse-index: copy dir_hash in ensure_full_index()

 The sparse-index support can corrupt the index structure by storing
 a stale and/or uninitialized data, which has been corrected.

 Will merge to 'master'.


* mh/send-email-reset-in-reply-to (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-03 at 3a60892d9a)
 + send-email: avoid incorrect header propagation

 Even when running "git send-email" without its own threaded
 discussion support, a threading related header in one message is
 carried over to the subsequent message to result in an unwanted
 threading, which has been corrected.

 Will merge to 'master'.


* rs/more-fspathcmp (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at 3052b89438)
 + merge-recursive: use fspathcmp() in path_hashmap_cmp()

 Code simplification.

 Will merge to 'master'.


* sg/set-ceiling-during-tests (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at 5378ce3817)
 + test-lib: set GIT_CEILING_DIRECTORIES to protect the surrounding repository

 Buggy tests could damage repositories outside the throw-away test
 area we created.  We now by default export GIT_CEILING_DIRECTORIES
 to limit the damage from such a stray test.

 Will merge to 'master'.


* ab/gc-log-rephrase (2021-09-02) 1 commit
  (merged to 'next' on 2021-09-03 at 24c51e3df1)
 + gc: remove trailing dot from "gc.log" line

 A pathname in an advice message has been made cut-and-paste ready.

 Will merge to 'master'.


* ab/mailmap-leakfix (2021-08-31) 1 commit
  (merged to 'next' on 2021-09-03 at 348fe07b87)
 + mailmap.c: fix a memory leak in free_mailap_{info,entry}()

 Leakfix.

 Will merge to 'master'.


* ba/object-info (2021-08-31) 1 commit
  (merged to 'next' on 2021-09-03 at 6d47f59ab4)
 + protocol-caps.c: fix memory leak in send_info()

 Leakfix.

 Will merge to 'master'.


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


* sg/test-split-index-fix (2021-09-07) 7 commits
 - read-cache: fix GIT_TEST_SPLIT_INDEX
 - tests: disable GIT_TEST_SPLIT_INDEX for sparse index tests
 - read-cache: look for shared index files next to the index, too
 - t1600-index: disable GIT_TEST_SPLIT_INDEX
 - t1600-index: don't run git commands upstream of a pipe
 - t1600-index: remove unnecessary redirection
 - Merge branch 'ds/sparse-index-ignored-files' into sg/test-split-index-fix
 (this branch uses ds/sparse-index-ignored-files.)

 Test updates.


* tk/fast-export-anonymized-tag-fix (2021-08-31) 1 commit
  (merged to 'next' on 2021-09-03 at 15ce1ab44f)
 + fast-export: fix anonymized tag using original length

 The output from "git fast-export", when its anonymization feature
 is in use, showed an annotated tag incorrectly.

 Will merge to 'master'.


* uk/userdiff-php-enum (2021-08-31) 1 commit
  (merged to 'next' on 2021-09-03 at 5c9eb654fe)
 + userdiff: support enum keyword in PHP hunk header

 Update the userdiff pattern for PHP.

 Will merge to 'master'.


* ab/commit-graph-usage (2021-08-30) 7 commits
  (merged to 'next' on 2021-09-03 at 2254ea1e58)
 + commit-graph: show "unexpected subcommand" error
 + commit-graph: show usage on "commit-graph [write|verify] garbage"
 + commit-graph: early exit to "usage" on !argc
 + multi-pack-index: refactor "goto usage" pattern
 + commit-graph: use parse_options_concat()
 + commit-graph: remove redundant handling of -h
 + commit-graph: define common usage with a macro

 Fixes on usage message from "git commit-graph".

 Will merge to 'master'.


* ab/ls-remote-packet-trace (2021-08-24) 1 commit
  (merged to 'next' on 2021-08-30 at fec2e5a7eb)
 + ls-remote: set packet_trace_identity(<name>)

 Debugging aid fix.

 Will merge to 'master'.


* ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit
  (merged to 'next' on 2021-08-30 at 256e1cbc9e)
 + rebase: emit one "fatal" in "fatal: fatal: <error>"

 Error message fix.

 Will merge to 'master'.


* ab/refs-errno-cleanup (2021-08-25) 4 commits
 - refs: make errno output explicit for refs_resolve_ref_unsafe
 - refs: explicitly return failure_errno from parse_loose_ref_contents
 - branch tests: test for errno propagating on failing read
 - refs: add failure_errno to refs_read_raw_ref() signature
 (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)

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


* ab/retire-advice-config (2021-08-25) 4 commits
  (merged to 'next' on 2021-09-03 at 0045df3dbb)
 + advice: move advice.graftFileDeprecated squashing to commit.[ch]
 + advice: remove use of global advice_add_embedded_repo
 + advice: remove read uses of most global `advice_` variables
 + advice: add enum variants for missing advice variables

 Code clean up to migrate callers from older advice_config[] based
 API to newer advice_if_enabled() and advice_enabled() API.

 Will merge to 'master'.


* dd/diff-files-unmerged-fix (2021-08-25) 1 commit
  (merged to 'next' on 2021-08-30 at 63a1bdddfc)
 + diff-lib: ignore paths that are outside $cwd if --relative asked

 "git diff --relative" segfaulted and/or produced incorrect result
 when there are unmerged paths.

 Will merge to 'master'.


* dd/t6300-wo-gpg-fix (2021-08-25) 2 commits
  (merged to 'next' on 2021-08-30 at 59f5669dd6)
 + t6300: check for cat-file exit status code
 + t6300: don't run cat-file on non-existent object

 Test fix.

 Will merge to 'master'.


* ga/send-email-sendmail-cmd (2021-08-24) 1 commit
  (merged to 'next' on 2021-08-30 at 1bb659c66c)
 + t9001: PATH must not use Windows-style paths

 Test fix.

 Will merge to 'master'.


* jb/midx-revindex-fix (2021-08-23) 1 commit
 - multi-pack-index: fix *.rev cleanups with --object-dir

 An implementation in "multi-pack-index write" that takes object
 directory inconsistently used that and the object store of the
 default repository, causing segfaults and possibly corrupting
 repositories.

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


* jk/t5323-no-pack-test-fix (2021-08-25) 1 commit
  (merged to 'next' on 2021-08-30 at 2892635eaf)
 + t5323: drop mentions of "master"

 Test fix.

 Will merge to 'master'.


* js/maintenance-launchctl-fix (2021-08-24) 2 commits
  (merged to 'next' on 2021-08-30 at 12a5da47e7)
 + maintenance: skip bootout/bootstrap when plist is registered
 + maintenance: create `launchctl` configuration using a lock file

 "git maintenance" scheduler fix for macOS.

 Will merge to 'master'.


* jv/pkt-line-batch (2021-09-01) 2 commits
 - upload-pack: use stdio in send_ref callbacks
 - pkt-line: add stdio packet write functions

 Reduce number of write(2) system calls while sending the
 ref advertisement.

 Will merge to 'next'?


* me/t5582-cleanup (2021-08-24) 1 commit
  (merged to 'next' on 2021-08-30 at e92258e72c)
 + t5582: remove spurious 'cd "$D"' line

 Test fix.

 Will merge to 'master'.


* mh/credential-leakfix (2021-08-25) 1 commit
  (merged to 'next' on 2021-08-30 at be9e67bddc)
 + credential: fix leak in credential_apply_config()

 Leak fix.

 Will merge to 'master'.


* mt/quiet-with-delayed-checkout (2021-08-26) 1 commit
  (merged to 'next' on 2021-08-30 at d243498893)
 + checkout: make delayed checkout respect --quiet and --no-progress

 The delayed checkout code path in "git checkout" etc. were chatty
 even when --quiet and/or --no-progress options were given.

 Will merge to 'master'.


* ps/fetch-omit-formatting-under-quiet (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at 2440a8a2aa)
 + fetch: skip formatting updated refs with `--quiet`

 "git fetch --quiet" optimization to avoid useless computation of
 info that will never be displayed.

 Will merge to 'master'.


* ps/ls-refs-strbuf-optim (2021-08-25) 1 commit
  (merged to 'next' on 2021-08-30 at e4cbc7243a)
 + ls-refs: reuse buffer when sending refs

 Micro-optimization for the wire protocol driver.

 Will merge to 'master'.


* rs/branch-allow-deleting-dangling (2021-08-27) 1 commit
  (merged to 'next' on 2021-08-30 at 35b9d158e8)
 + branch: allow deleting dangling branches with --force

 "git branch -D <branch>" used to refuse to remove a broken branch
 ref that points at a missing commit, which has been corrected.

 Will merge to 'master'.


* rs/git-mmap-uses-malloc (2021-08-24) 1 commit
  (merged to 'next' on 2021-08-30 at 6339c8e657)
 + compat: let git_mmap use malloc(3) directly

 mmap() imitation used to call xmalloc() that dies upon malloc()
 failure, which has been corrected to just return an error to the
 caller to be handled.

 Will merge to 'master'.


* rs/xopen-reports-open-failures (2021-08-25) 2 commits
  (merged to 'next' on 2021-08-30 at a8588775c8)
 + use xopen() to handle fatal open(2) failures
 + xopen: explicitly report creation failures

 Error diagnostics improvement.

 Will merge to 'master'.


* sg/column-nl (2021-08-26) 1 commit
  (merged to 'next' on 2021-08-30 at a3cb0f4745)
 + column: fix parsing of the '--nl' option

 The parser for the "--nl" option of "git column" has been
 corrected.

 Will merge to 'master'.


* ab/unbundle-progress (2021-09-07) 4 commits
 - bundle: show progress on "unbundle"
 - index-pack: add --progress-title option
 - bundle API: change "flags" to be "extra_index_pack_args"
 - bundle API: start writing API documentation

 Add progress display to "git bundle unbundle".

 Will merge to 'next'?


* jk/log-warn-on-bogus-encoding (2021-08-27) 2 commits
 - docs: use "character encoding" to refer to commit-object encoding
 - logmsg_reencode(): warn when iconv() fails

 Doc update plus improved error reporting.

 Will merge to 'next'.


* rs/archive-use-object-id (2021-08-27) 1 commit
 - archive: convert queue_directory to struct object_id

 Code cleanup.

 Will merge to 'next'.


* rs/show-branch-simplify (2021-08-27) 1 commit
 - show-branch: simplify rev_is_head()

 Code cleanup.

 Will merge to 'next'.


* lh/systemd-timers (2021-09-07) 3 commits
 - maintenance: add support for systemd timers on Linux
 - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
 - cache.h: Introduce a generic "xdg_config_home_for(…)" function

 "git maintenance" scheduler learned to use systemd timers as a
 possible backend.

 Will merge to 'next'.


* ps/fetch-optim (2021-09-01) 7 commits
 - fetch: avoid second connectivity check if we already have all objects
 - fetch: merge fetching and consuming refs
 - fetch: refactor fetch refs to be more extendable
 - fetch-pack: optimize loading of refs via commit graph
 - connected: refactor iterator to return next object ID directly
 - fetch: avoid unpacking headers in object existence check
 - fetch: speed up lookup of want refs via commit-graph

 Optimize code that handles large number of refs in the "git fetch"
 code path.

 Will merge to 'next'.


* ar/submodule-run-update-procedure (2021-08-24) 1 commit
 - submodule--helper: run update procedures from C

 Reimplementation of parts of "git submodule" in C continues.

 Will merge to 'next'.


* ab/help-autocorrect-prompt (2021-08-14) 1 commit
 - help.c: help.autocorrect=prompt waits for user action

 The logic for auto-correction of misspelt subcommands learned to go
 interactive when the help.autocorrect configuration variable is set
 to true.

 Will merge to 'next'.


* zh/cherry-pick-advice (2021-08-23) 1 commit
  (merged to 'next' on 2021-09-01 at 6ff491cc09)
 + cherry-pick: use better advice message

 The advice message that "git cherry-pick" gives when it asks
 conflicted replay of a commit to be resolved by the end user has
 been updated.

 Will merge to 'master'.


* mk/clone-recurse-submodules (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-03 at 9787178599)
 + clone: set submodule.recurse=true if submodule.stickyRecursiveClone enabled

 After "git clone --recurse-submodules", all submodules are cloned
 but they are not by default recursed into by other commands.  With
 submodule.stickyRecursiveClone configuration set, submodule.recurse
 configuration is set to true in a repository created by "clone"
 with "--recurse-submodules" option.

 Will merge to 'master'.


* ka/want-ref-in-namespace (2021-09-01) 3 commits
  (merged to 'next' on 2021-09-01 at a1075a92a9)
 + docs: clarify the interaction of transfer.hideRefs and namespaces
 + upload-pack.c: treat want-ref relative to namespace
 + t5730: introduce fetch command helper

 "git upload-pack" which runs on the other side of "git fetch"
 forgot to take the ref namespaces into account when handling
 want-ref requests.

 Will merge to 'master'.


* cb/ci-build-pedantic (2021-08-11) 1 commit
 - ci: run a pedantic build as part of the GitHub workflow

 CI update.

 Will merge to 'next'.


* ds/sparse-index-ignored-files (2021-09-07) 10 commits
 - sparse-checkout: clear tracked sparse dirs
 - sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag
 - attr: be careful about sparse directories
 - sparse-checkout: create helper methods
 - sparse-index: use WRITE_TREE_MISSING_OK
 - sparse-index: silently return when cache tree fails
 - unpack-trees: fix nested sparse-dir search
 - sparse-index: silently return when not using cone-mode patterns
 - t7519: rewrite sparse index test
 - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
 (this branch is used by sg/test-split-index-fix.)

 In cone mode, the sparse-index codepath learned to remove ignored
 files (like build artifacts) outside the sparse cone, allowing the
 entire directory outside the sparse cone to be removed, which is
 especially useful when the sparse patterns change.

 Will merge to 'next'?


* js/advise-when-skipping-cherry-picked (2021-08-30) 1 commit
  (merged to 'next' on 2021-09-01 at bc883fce56)
 + sequencer: advise if skipping cherry-picked commit

 "git rebase" by default skips changes that are equivalent to
 commits that are already in the history the branch is rebased onto;
 give messages when this happens to let the users be aware of
 skipped commits, and also teach them how to tell "rebase" to keep
 duplicated changes.

 Will merge to 'master'.


* jt/grep-wo-submodule-odb-as-alternate (2021-09-07) 8 commits
 - t7814: show lack of alternate ODB-adding
 - submodule-config: pass repo upon blob config read
 - grep: add repository to OID grep sources
 - grep: allocate subrepos on heap
 - grep: read submodule entry with explicit repo
 - grep: typesafe versions of grep_source_init
 - grep: use submodule-ODB-as-alternate lazy-addition
 - submodule: lazily add submodule ODBs as alternates

 The code to make "git grep" recurse into submodules has been
 updated to migrate away from the "add submodule's object store as
 an alternate object store" mechanism (which is suboptimal).

 Will merge to 'next'.


* ar/submodule-add-more (2021-08-10) 10 commits
 - submodule--helper: rename compute_submodule_clone_url()
 - submodule--helper: remove resolve-relative-url subcommand
 - submodule--helper: remove add-config subcommand
 - submodule--helper: remove add-clone subcommand
 - submodule--helper: convert the bulk of cmd_add() to C
 - dir: libify and export helper functions from clone.c
 - submodule--helper: remove repeated code in sync_submodule()
 - submodule--helper: refactor resolve_relative_url() helper
 - submodule--helper: add options for compute_submodule_clone_url()
 - Merge branch 'ar/submodule-add-config' into ar/submodule-add
 (this branch uses ar/submodule-add-config.)

 More parts of "git submoudle add" has been rewritten in C.

 Will merge to 'next'.


* cb/makefile-apple-clang (2021-08-06) 3 commits
  (merged to 'next' on 2021-08-30 at 9fe8f1a9b3)
 + build: catch clang that identifies itself as "$VENDOR clang"
 + build: clang version may not be followed by extra words
 + build: update detect-compiler for newer Xcode version

 Build update for Apple clang.

 Will merge to 'master'.


* ab/lib-subtest (2021-08-05) 11 commits
 - test-lib tests: assert 1 exit code, not non-zero
 - test-lib tests: refactor common part of check_sub_test_lib_test*()
 - test-lib tests: avoid subshell for "test_cmp" for readability
 - test-lib tests: assert no copy/pasted mock test code
 - test-lib tests: get rid of copy/pasted mock test code
 - test-lib tests: don't provide a description for the sub-tests
 - test-lib tests: stop using a subshell in write_sub_test_lib_test()
 - test-lib tests: split up "write and run" into two functions
 - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
 - Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
 - Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest

 Updates to the tests in t0000 to test the test framework.


* ab/only-single-progress-at-once (2021-07-23) 8 commits
 - progress.c: add & assert a "global_progress" variable
 - pack-bitmap-write.c: add a missing stop_progress()
 - progress.c: add temporary variable from progress struct
 - progress.c: stop eagerly fflush(stderr) when not a terminal
 - progress.c: call progress_interval() from progress_test_force_update()
 - progress.c: move signal handler functions lower
 - progress.c tests: test some invalid usage
 - progress.c tests: make start/stop verbs on stdin

 Further tweaks on progress API.

 On hold.
 cf. <20210901050406.GB76263@szeder.dev>


* ab/progress-users-adjust-counters (2021-08-25) 2 commits
 - entry: show finer-grained counter in "Filtering content" progress line
 - commit-graph: fix bogus counter in "Scanning merged commits" progress line

 The code to show progress indicator in a few codepaths did not
 cover between 0-100%, which has been corrected.

 Will merge to 'next'?


* ar/submodule-add-config (2021-08-10) 1 commit
 - submodule--helper: introduce add-config subcommand
 (this branch is used by ar/submodule-add-more.)

 Large part of "git submodule add" gets rewritten in C.

 Will merge to 'next'.


* dt/submodule-diff-fixes (2021-08-31) 3 commits
 - diff --submodule=diff: don't print failure message twice
 - diff --submodule=diff: do not fail on ever-initialied deleted submodules
 - t4060: remove unused variable

 "git diff --submodule=diff" showed failure from run_command() when
 trying to run diff inside a submodule, when the user manually
 removes the submodule directory.

 Will merge to 'next'?
 cf. <20210812001332.715876-1-dturner@twosigma.com>


* fs/ssh-signing (2021-08-29) 9 commits
  (merged to 'next' on 2021-09-03 at eed4e814c0)
 + ssh signing: test that gpg fails for unknown keys
 + ssh signing: tests for logs, tags & push certs
 + ssh signing: duplicate t7510 tests for commits
 + ssh signing: verify signatures using ssh-keygen
 + ssh signing: provide a textual signing_key_id
 + ssh signing: retrieve a default key from ssh-agent
 + ssh signing: add ssh key format and signing code
 + ssh signing: add test prereqs
 + ssh signing: preliminary refactoring and clean-up

 Use ssh public crypto for object and push-cert signing.

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


* cf/fetch-set-upstream-while-detached (2021-07-06) 1 commit
 - fetch: fix segfault on --set-upstream while on a detached HEAD

 "git fetch --set-upstream" while on detached HEAD segfaulted
 instead of noticing that such an operation did not make sense.

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


* ab/make-tags-cleanup (2021-08-05) 5 commits
 - Makefile: normalize clobbering & xargs for tags targets
 - Makefile: remove "cscope.out", not "cscope*" in cscope.out target
 - Makefile: don't use "FORCE" for tags targets
 - Makefile: add QUIET_GEN to "cscope" target
 - Makefile: move ".PHONY: cscope" near its target

 Build clean-up for "make tags" and friends.

 Will merge to 'next'?


* tb/multi-pack-bitmaps (2021-09-01) 27 commits
 - p5326: perf tests for MIDX bitmaps
 - p5310: extract full and partial bitmap tests
 - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
 - t7700: update to work with MIDX bitmap test knob
 - t5319: don't write MIDX bitmaps in t5319
 - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
 - t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
 - t5326: test multi-pack bitmap behavior
 - t/helper/test-read-midx.c: add --checksum mode
 - t5310: move some tests to lib-bitmap.sh
 - pack-bitmap: write multi-pack bitmaps
 - pack-bitmap: read multi-pack bitmaps
 - pack-bitmap.c: avoid redundant calls to try_partial_reuse
 - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
 - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
 - pack-bitmap.c: introduce 'bitmap_num_objects()'
 - midx: avoid opening multiple MIDXs when writing
 - midx: close linked MIDXs, avoid leaking memory
 - midx: infer preferred pack when not given one
 - midx: reject empty `--preferred-pack`'s
 - midx: clear auxiliary .rev after replacing the MIDX
 - midx: fix `*.rev` cleanups with `--object-dir`
 - midx: disallow running outside of a repository
 - Documentation: describe MIDX-based bitmaps
 - pack-bitmap-write.c: free existing bitmaps
 - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
 - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps

 The reachability bitmap file used to be generated only for a single
 pack, but now we've learned to generate bitmaps for history that
 span across multiple packfiles.

 Will merge to 'next'.


* ab/config-based-hooks-base (2021-08-03) 36 commits
 - hooks: fix a TOCTOU in "did we run a hook?" heuristic
 - receive-pack: convert receive hooks to hook.h
 - post-update: use hook.h library
 - receive-pack: convert 'update' hook to hook.h
 - hooks: allow callers to capture output
 - run-command: allow capturing of collated output
 - reference-transaction: use hook.h to run hooks
 - hook tests: use a modern style for "pre-push" tests
 - hook tests: test for exact "pre-push" hook input
 - transport: convert pre-push hook to hook.h
 - hook: convert 'post-rewrite' hook in sequencer.c to hook.h
 - hook: provide stdin by string_list or callback
 - run-command: add stdin callback for parallelization
 - am: convert 'post-rewrite' hook to hook.h
 - hook: support passing stdin to hooks
 - run-command: allow stdin for run_processes_parallel
 - 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
 - hook-list.h: add a generated list of hooks, like config-list.h
 - hook.c users: use "hook_exists()" insted of "find_hook()"
 - hook.c: add a hook_exists() wrapper and use it in bugreport.c
 - hook.[ch]: move find_hook() to this new library
 - Makefile: remove an out-of-date comment
 - Makefile: stop hardcoding {command,config}-list.h
 - Makefile: mark "check" target as .PHONY
 (this branch is used by es/config-based-hooks.)

 Restructuring of (a subset of) Emily's config-based-hooks series,
 to demonstrate that a series can be presented as a more logical and
 focused progression.

 Waiting for reviews.


* ab/serve-cleanup (2021-08-05) 10 commits
 - upload-pack: document and rename --advertise-refs
 - serve.[ch]: remove "serve_options", split up --advertise-refs code
 - {upload,receive}-pack tests: add --advertise-refs tests
 - serve.c: move version line to advertise_capabilities()
 - serve: move transfer.advertiseSID check into session_id_advertise()
 - serve.[ch]: don't pass "struct strvec *keys" to commands
 - serve: use designated initializers
 - transport: use designated initializers
 - transport: rename "fetch" in transport_vtable to "fetch_refs"
 - serve: mark has_capability() as static

 Code clean-up around "git serve".

 Will merge to 'next'?


* ab/test-tool-cache-cleanup (2021-08-24) 4 commits
 - read-cache perf: add a perf test for refresh_index()
 - test-tool: migrate read-cache-again to parse_options()
 - test-tool: migrate read-cache-perf to parse_options()
 - test-tool: split up test-tool read-cache

 Test code shuffling.

 Will discard.
 cf. <87tuj7xhqo.fsf@evledraar.gmail.com>


* ab/pack-objects-stdin (2021-07-09) 5 commits
 - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
 - pack-objects.c: do stdin parsing via revision.c's API
 - revision.[ch]: add a "handle_stdin_line" API
 - revision.h: refactor "disable_stdin" and "read_from_stdin"
 - upload-pack: run is_repository_shallow() before setup_revisions()

 Introduce handle_stdin_line callback to revision API and uses it.

 Waiting for reviews.


* pw/diff-color-moved-fix (2021-08-05) 13 commits
 - diff: drop unused options parameter from cmp_in_block_with_wsd()
 - 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: add perf tests

 Originally merged to 'next' on 2021-08-05

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

 Eject for reroll.
 cf. <8bec1a6d-5052-50c3-4100-e6348289d581@gmail.com>


* hn/reftable (2021-09-07) 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: RFC: add LICENSE
 - hash.h: provide constants for the hash IDs

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


* ab/refs-files-cleanup (2021-08-25) 13 commits
 - refs/files: remove unused "errno != ENOTDIR" condition
 - refs/files: remove unused "errno == EISDIR" code
 - refs/files: remove unused "oid" in lock_ref_oid_basic()
 - refs API: remove OID argument to reflog_expire()
 - reflog expire: don't lock reflogs using previously seen OID
 - refs/files: add a comment about refs_reflog_exists() call
 - refs: make repo_dwim_log() accept a NULL oid
 - refs/debug: re-indent argument list for "prepare"
 - refs/files: remove unused "skip" in lock_raw_ref() too
 - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
 - refs: drop unused "flags" parameter to lock_ref_oid_basic()
 - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
 - refs/packet: add missing BUG() invocations to reflog callbacks
 (this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.)

 Continued work on top of the hn/refs-errno-cleanup topic.


* hn/refs-errno-cleanup (2021-08-25) 4 commits
 - refs: make errno output explicit for read_raw_ref_fn
 - refs/files-backend: stop setting errno from lock_ref_oid_basic
 - refs: remove EINVAL errno output from specification of read_raw_ref_fn
 - refs file backend: move raceproof_create_file() here
 (this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.)

 Futz with the way 'errno' is relied on in the refs API to carry the
 failure modes up the callchain.

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

* zh/cherry-pick-help-is-only-for-sequencer (2021-08-03) 2 commits
 . cherry-pick: use better advice message
 . cherry-pick: fix bug when used with GIT_CHERRY_PICK_HELP

 Originally merged to 'next' on 2021-08-04

 "git cherry-pick" loses its state file when a stray
 GIT_CHERRY_PICK_HELP environment is present, which has been
 corrected.

 Reverted out of 'next' at 1f62d2e1 on 2021-08-11


* jk/refs-files-cleanup-cleanup (2021-08-19) 1 commit
 . refs: drop unused "flags" parameter to lock_ref_oid_basic()

 Code cleanup.

 Obsoleted by updated ab/refs-files-cleanup


* ow/clone-bare-origin (2021-08-03) 1 commit
 - clone: Allow combining --bare and --origin

 "git clone" did not like to take "--bare" and "--origin=X" at the
 same time; loosen the restriction.

 cf. <20210802174944.53745-1-oystwa@gmail.com>


* np/blame-ignore-revs-file-may-be-optional (2021-08-09) 1 commit
 - blame: add config `blame.ignoreRevsFileIsOptional`

 When the file named by blame.ignoreRevsFile configuration variable
 does not exist, it causes "git blame" to die.  Sometimes, it is
 useful if the files named by configuration variables can be made
 optional (it would allow ~/.gitconfig to give a filename, and make
 it effective only in repositories that have a file with that name).

 This uses an extra variable that marks that the variable is
 optional.  Yet another alternative is being discussed to define
 syntax for "optional" filename values, so that the same mechanism
 can be used for not just blame.ignoreRevsFile but other filenames.

 Queued just as a reminder of the theme.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Taylor Blau]

On Wed, Sep 08, 2021 at 08:38:55AM -0700, Junio C Hamano wrote:
> * tb/pack-finalize-ordering (2021-09-07) 2 commits
>  - builtin/repack.c: move `.idx` files into place last
>  - pack-write.c: rename `.idx` file into place last
>
>  The order in which various files that make up a single (conceptual)
>  packfile has been reevaluated and straightened up.  This matters in
>  correctness, as an incomplete set of files must not be shown to a
>  running Git.
>
>  Will merge to 'next'?

Ævar has a series [1] that complements this one nicely, so I would be
happy to see them both queued.

I had some suggestions inline, but I don't feel strongly about whether
or not they are implemented.

Thanks,
Taylor

[1]: https://lore.kernel.org/git/cover-v2-0.4-0000000000-20210908T003631Z-avarab@gmail.com/

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Azeem Bande-Ali]

On Wed, Sep 8, 2021 at 11:39 AM Junio C Hamano <gitster@pobox.com> wrote:
>
> * ab/help-autocorrect-prompt (2021-08-14) 1 commit
>  - help.c: help.autocorrect=prompt waits for user action
>
>  The logic for auto-correction of misspelt subcommands learned to go
>  interactive when the help.autocorrect configuration variable is set
>  to true.
>
>  Will merge to 'next'.

Just a minor issue with the description: help.autocorrect will have to
be set to "prompt" for this setting to work.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Philippe Blain]

Hi Junio,

Le 2021-09-08 à 11:38, Junio C Hamano a écrit :
> 
> * pb/test-use-user-env (2021-09-07) 3 commits
>   - test-lib-functions: keep user's debugger config files and TERM in 'debug'
>   - test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'
>   - test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'
> 
>   Teach test_pause and test_debug to allow using the HOME and TERM
>   environment variables the user usually uses.

The name of the debug helper is 'debug', not 'test_debug' ;)

Also, technically with my v5 'debug' does not use the full $HOME but
just $HOME/.[g|ll]dbinit, but for this merge message I guess it does
not matter much, and I don't have anything better to propose :)

> 
>   Will merge to 'next'?
> 

 From my part I think it's ready, I think I've adressed all feedback.

Thanks,
Philippe.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Azeem Bande-Ali <me@azeemba.com> writes:

> On Wed, Sep 8, 2021 at 11:39 AM Junio C Hamano <gitster@pobox.com> wrote:
>>
>> * ab/help-autocorrect-prompt (2021-08-14) 1 commit
>>  - help.c: help.autocorrect=prompt waits for user action
>>
>>  The logic for auto-correction of misspelt subcommands learned to go
>>  interactive when the help.autocorrect configuration variable is set
>>  to true.
>>
>>  Will merge to 'next'.
>
> Just a minor issue with the description: help.autocorrect will have to
> be set to "prompt" for this setting to work.

I think this was already pointed out in an earlier edition of the
What's cooking report, but I simply forgot to update it.

Sorry, and thanks.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Taylor Blau <me@ttaylorr.com> writes:

> On Wed, Sep 08, 2021 at 08:38:55AM -0700, Junio C Hamano wrote:
>> * tb/pack-finalize-ordering (2021-09-07) 2 commits
>>  - builtin/repack.c: move `.idx` files into place last
>>  - pack-write.c: rename `.idx` file into place last
>>
>>  The order in which various files that make up a single (conceptual)
>>  packfile has been reevaluated and straightened up.  This matters in
>>  correctness, as an incomplete set of files must not be shown to a
>>  running Git.
>>
>>  Will merge to 'next'?
>
> Ævar has a series [1] that complements this one nicely, so I would be
> happy to see them both queued.
>
> I had some suggestions inline, but I don't feel strongly about whether
> or not they are implemented.

I hate to see multiple folks "competing" in the overlapping area,
each getting reviews and responding or not responding at their own
pace.  That would force me to keep track of which one is which and
what their doneness are independently.

Do you mind if I nominate you the team leader to come up with a
single series that is polished to be mergeable to 'next'?

Thanks.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Jeff King]

On Wed, Sep 08, 2021 at 12:24:09PM -0400, Taylor Blau wrote:

> On Wed, Sep 08, 2021 at 08:38:55AM -0700, Junio C Hamano wrote:
> > * tb/pack-finalize-ordering (2021-09-07) 2 commits
> >  - builtin/repack.c: move `.idx` files into place last
> >  - pack-write.c: rename `.idx` file into place last
> >
> >  The order in which various files that make up a single (conceptual)
> >  packfile has been reevaluated and straightened up.  This matters in
> >  correctness, as an incomplete set of files must not be shown to a
> >  running Git.
> >
> >  Will merge to 'next'?
> 
> Ævar has a series [1] that complements this one nicely, so I would be
> happy to see them both queued.
> 
> I had some suggestions inline, but I don't feel strongly about whether
> or not they are implemented.

I think regardless of Ævar's related patches, we'd want to see a re-roll
of yours that touches index-pack's final(), too.

-Peff

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Derrick Stolee]

On 9/8/2021 11:38 AM, Junio C Hamano wrote:> * ds/sparse-index-ignored-files (2021-09-07) 10 commits
>  - sparse-checkout: clear tracked sparse dirs
>  - sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag
>  - attr: be careful about sparse directories
>  - sparse-checkout: create helper methods
>  - sparse-index: use WRITE_TREE_MISSING_OK
>  - sparse-index: silently return when cache tree fails
>  - unpack-trees: fix nested sparse-dir search
>  - sparse-index: silently return when not using cone-mode patterns
>  - t7519: rewrite sparse index test
>  - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
>  (this branch is used by sg/test-split-index-fix.)
> 
>  In cone mode, the sparse-index codepath learned to remove ignored
>  files (like build artifacts) outside the sparse cone, allowing the
>  entire directory outside the sparse cone to be removed, which is
>  especially useful when the sparse patterns change.
> 
>  Will merge to 'next'?

I think this one is ready to go. Elijah chimed in on the latest
version, too.

This also means that perhaps we could start tracking the sparse
index integrations with merge, rebase, cherry-pick, and revert [1]?
This series has also had quite a bit of review, but the latest
version has not had an ack. 

[1] https://lore.kernel.org/git/pull.1019.v3.git.1631100241.gitgitgadget@gmail.com

I also plan to send a new version of the --sparse RFC [2], which
is based on [1]. I don't want to get too far ahead of what the
community has capacity to review.

[2] https://lore.kernel.org/git/pull.1018.git.1629842085.gitgitgadget@gmail.com/

Thanks,
-Stolee

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Taylor Blau]

On Wed, Sep 08, 2021 at 12:23:57PM -0700, Junio C Hamano wrote:
> Taylor Blau <me@ttaylorr.com> writes:
>
> > On Wed, Sep 08, 2021 at 08:38:55AM -0700, Junio C Hamano wrote:
> >> * tb/pack-finalize-ordering (2021-09-07) 2 commits
> >>  - builtin/repack.c: move `.idx` files into place last
> >>  - pack-write.c: rename `.idx` file into place last
> >>
> >>  The order in which various files that make up a single (conceptual)
> >>  packfile has been reevaluated and straightened up.  This matters in
> >>  correctness, as an incomplete set of files must not be shown to a
> >>  running Git.
> >>
> >>  Will merge to 'next'?
> >
> > Ævar has a series [1] that complements this one nicely, so I would be
> > happy to see them both queued.
> >
> > I had some suggestions inline, but I don't feel strongly about whether
> > or not they are implemented.
>
> I hate to see multiple folks "competing" in the overlapping area,
> each getting reviews and responding or not responding at their own
> pace.  That would force me to keep track of which one is which and
> what their doneness are independently.
>
> Do you mind if I nominate you the team leader to come up with a
> single series that is polished to be mergeable to 'next'?

Not at all; sorry that I missed your email before submitting a v2 of the
earlier series.

Ævar seems to have combined them while I was eating dinner, but I'll
coordinate with him and send out a unified result for you to queue up.

Thanks,
Taylor

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Ramsay Jones]

On 08/09/2021 16:38, Junio C Hamano wrote:

test t5319-multi-pack-index.sh on 'seen' has been failing for
several days, so I had a quick look tonight. This issue relates
to the following two topics:

> * jb/midx-revindex-fix (2021-08-23) 1 commit
>  - multi-pack-index: fix *.rev cleanups with --object-dir
> 
>  An implementation in "multi-pack-index write" that takes object
>  directory inconsistently used that and the object store of the
>  default repository, causing segfaults and possibly corrupting
>  repositories.
> 
>  On hold.
>  cf. <xmqqo89jbf49.fsf@gitster.g>
> 

...

> * tb/multi-pack-bitmaps (2021-09-01) 27 commits
>  - p5326: perf tests for MIDX bitmaps
>  - p5310: extract full and partial bitmap tests
>  - midx: respect 'GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP'
>  - t7700: update to work with MIDX bitmap test knob
>  - t5319: don't write MIDX bitmaps in t5319
>  - t5310: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
>  - t0410: disable GIT_TEST_MULTI_PACK_INDEX_WRITE_BITMAP
>  - t5326: test multi-pack bitmap behavior
>  - t/helper/test-read-midx.c: add --checksum mode
>  - t5310: move some tests to lib-bitmap.sh
>  - pack-bitmap: write multi-pack bitmaps
>  - pack-bitmap: read multi-pack bitmaps
>  - pack-bitmap.c: avoid redundant calls to try_partial_reuse
>  - pack-bitmap.c: introduce 'bitmap_is_preferred_refname()'
>  - pack-bitmap.c: introduce 'nth_bitmap_object_oid()'
>  - pack-bitmap.c: introduce 'bitmap_num_objects()'
>  - midx: avoid opening multiple MIDXs when writing
>  - midx: close linked MIDXs, avoid leaking memory
>  - midx: infer preferred pack when not given one
>  - midx: reject empty `--preferred-pack`'s
>  - midx: clear auxiliary .rev after replacing the MIDX
>  - midx: fix `*.rev` cleanups with `--object-dir`
>  - midx: disallow running outside of a repository
>  - Documentation: describe MIDX-based bitmaps
>  - pack-bitmap-write.c: free existing bitmaps
>  - pack-bitmap-write.c: gracefully fail to write non-closed bitmaps
>  - pack-bitmap.c: harden 'test_bitmap_walk()' to check type bitmaps
> 
>  The reachability bitmap file used to be generated only for a single
>  pack, but now we've learned to generate bitmaps for history that
>  span across multiple packfiles.
> 
>  Will merge to 'next'.

The merge commit 24cade3ceb ("Merge branch 'jb/midx-revindex-fix' into seen",
2021-09-07) basically takes two versions of the same patch and keeps both
versions of the same test. The two patches are:

  - c575d4a2d9 ("multi-pack-index: fix *.rev cleanups with --object-dir",
    2021-08-23)
  - 426c00e454 ("midx: fix `*.rev` cleanups with `--object-dir`", 2021-08-31)

(the second patch is from the 'tb/multi-pack-bitmaps' branch).

The second patch even includes an acknowledgment of 'Original-patch-by:
Johannes Berg <johannes@sipsolutions.net>' (ie the first patch).

  $ ./t5319-multi-pack-index.sh -i -v
...
  expecting success of 5319.19 'multi-pack-index *.rev cleanup with --object-dir':
...
  ok 19 - multi-pack-index *.rev cleanup with --object-dir

  expecting success of 5319.20 'multi-pack-index *.rev cleanup with --object-dir':
...
  fatal: not a git repository (or any of the parent directories): .git
...
  $

The 'fatal' message is issued by a call to 'nongit git multi-pack-index ... write'
command, which implies that 'git multi-pack-index' dies when not run from
a repository. When the original patch was written, that command would not
have died, so somewhere between v2.33.0 and 'seen' (maybe as part of the
'tb/multi-pack-bitmaps' branch, I haven't looked), that was changed and
that test no longer works.

If I had to change that test to take account of that change in behaviour,
then it would look pretty much the same as the new test in Taylor's commit
(and which can now be seen as test #19 above).

So, a solution would be to simply drop 'jb/midx-revindex-fix', since it
has effectively been incorporated into Taylor's branch. You could also
go the other way around, drop commit 426c00e454 from Taylor's branch and
fix up the test in Johannes's patch ... :-P

Well, I only had a quick look so (hopefully) I haven't missed something
obvious!

ATB,
Ramsay Jones

js/scalar, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * js/scalar (2021-09-03) 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/.

Thank you for picking it up. It seems as if the reviews are starting to
decrease to a point where I could imagine that we can start talking about
how to refactor things to start bringing the benefits to Git proper.

For what it's worth, I maintain a branch thicket on top of this branch
that has the remaining Scalar parts, both those parts that I still intend
to upstream as well as those parts that will most likely stay in
microsoft/git (e.g. the GVFS protocol-related parts, as it was decided
long ago that the VFS bits won't make it into Git proper, and
microsoft/git only needs these bits for compatibility with Azure Repos).

Here is the CI/PR run of that branch:
https://github.com/dscho/git/actions/runs/1216858695

And much more interesting is the run of the full Scalar Functional Tests
suite: https://github.com/dscho/git/actions/runs/1216858693

(Both pass, of course.)

Ciao,
Dscho

rs/range-diff-avoid-segfault-with-I, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * rs/range-diff-avoid-segfault-with-I (2021-09-07) 1 commit
>  - range-diff: avoid segfault with -I
>
>  "git range-diff -I... <range> <range>" segfaulted, which has been
>  corrected.
>
>  Will merge to 'next'?

Sounds good to me,
Dscho

js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * js/retire-preserve-merges (2021-09-07) 11 commits
>  - sequencer: restrict scope of a formerly public function
>  - rebase: remove a no-longer-used function
>  - rebase: stop mentioning the -p option in comments
>  - rebase: remove obsolete code comment
>  - rebase: drop the internal `rebase--interactive` command
>  - git-svn: drop support for `--preserve-merges`
>  - rebase: drop support for `--preserve-merges`
>  - pull: remove support for `--rebase=preserve`
>  - tests: stop testing `git rebase --preserve-merges`
>  - remote: warn about unhandled branch.<name>.rebase values
>  - t5520: do not use `pull.rebase=preserve`
>
>  The "--preserve-merges" option of "git rebase" has been removed.
>
>  Will merge to 'next'?

I think so, given the rate of reviews still trickling in tending toward
zero.

We probably want to keep it in `next` for quite a while, too, to make sure
that people get the memo.

Ciao,
Dscho

mr/bisect-in-c-4, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * mr/bisect-in-c-4 (2021-09-02) 6 commits
>  - bisect--helper: retire `--bisect-next-check` subcommand
>  - bisect--helper: reimplement `bisect_run` shell
>  - bisect--helper: reimplement `bisect_visualize()`shell function in C
>  - run-command: make `exists_in_PATH()` non-static
>  - t6030-bisect-porcelain: add test for bisect visualize
>  - t6030-bisect-porcelain: add tests to control bisect run exit cases
>
>  Rewrite of "git bisect" in C continues.

From my point of view, this is ready for `next`.

Ciao,
Dscho

lh/systemd-timers, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

[-- Attachment #1: Type: text/plain, Size: 575 bytes --]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * lh/systemd-timers (2021-09-07) 3 commits
>  - maintenance: add support for systemd timers on Linux
>  - maintenance: `git maintenance run` learned `--scheduler=<scheduler>`
>  - cache.h: Introduce a generic "xdg_config_home_for(…)" function
>
>  "git maintenance" scheduler learned to use systemd timers as a
>  possible backend.
>
>  Will merge to 'next'.

Yes!

And since you merged down `js/maintenance-launchctl-fix` to `master`
already, I guess I won't be rebasing it on top.

Ciao,
Dscho

ar/submodule-add-more, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Wed, 8 Sep 2021, Junio C Hamano wrote:

> * ar/submodule-add-more (2021-08-10) 10 commits
>  - submodule--helper: rename compute_submodule_clone_url()
>  - submodule--helper: remove resolve-relative-url subcommand
>  - submodule--helper: remove add-config subcommand
>  - submodule--helper: remove add-clone subcommand
>  - submodule--helper: convert the bulk of cmd_add() to C
>  - dir: libify and export helper functions from clone.c
>  - submodule--helper: remove repeated code in sync_submodule()
>  - submodule--helper: refactor resolve_relative_url() helper
>  - submodule--helper: add options for compute_submodule_clone_url()
>  - Merge branch 'ar/submodule-add-config' into ar/submodule-add
>  (this branch uses ar/submodule-add-config.)
>
>  More parts of "git submoudle add" has been rewritten in C.
>
>  Will merge to 'next'.

If you use the description in the release notes, please
`s/submoudle/submodule/` first.

Thanks,
Dscho

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Ævar Arnfjörð Bjarmason]

On Wed, Sep 08 2021, Junio C Hamano wrote:

As usual, updates on my topics & related:

First, I realize you're busy & I have a lot of things outstanding, but
just for completeness, trivial one-patch topics I submitted recently
that you didn't pick up. I think all of these are rather simple &
straightforward bug fixes / improvements:

* fetch-negotiator: call BUG() on API misuse, don't segfault:
  <patch-1.1-f1da49de63-20210727T000203Z-avarab@gmail.com>
  (https://lore.kernel.org/git/patch-1.1-f1da49de63-20210727T000203Z-avarab@gmail.com/)

* http.c: use error_errno(), not error() after fopen() failure:
  <patch-1.1-ad71faa6da-20210727T000657Z-avarab@gmail.com>
  (https://lore.kernel.org/git/patch-1.1-ad71faa6da-20210727T000657Z-avarab@gmail.com/)

* stash: print the correct usage on "git stash [push] --invalid-option":
  <patch-1.1-47c582f1218-20210901T111930Z-avarab@gmail.com>:
  https://lore.kernel.org/git/patch-1.1-47c582f1218-20210901T111930Z-avarab@gmail.com/

And then this 2-patch and slightly more complex series to make "git
<built-in> -h" output prettily aligned:

* parse-options: properly align continued usage output:
  <cover-0.2-00000000000-20210901T110917Z-avarab@gmail.com>:
  https://lore.kernel.org/git/cover-0.2-00000000000-20210901T110917Z-avarab@gmail.com/

Notes on picke-dup serieses below:

> * ab/no-more-check-bindir (2021-09-07) 1 commit
>  Will merge to 'next'.
> * ab/send-email-config-fix (2021-09-07) 1 commit
>  Will merge to 'next' and then to 'master'.
>  Will merge to 'next'.

Thanks!

>> * ab/reverse-midx-optim (2021-09-07) 1 commit
>  - pack-write: skip *.rev work when not writing *.rev

Already merged to "next" I see, thanks!

> * ab/sanitize-leak-ci (2021-09-07) 3 commits

Per your comment about this & my reply at
https://lore.kernel.org/git/87sfyfgtfh.fsf@evledraar.gmail.com/ & not
having heard back from Emily...

> * es/config-based-hooks (2021-08-19) 7 commits
> [...]
>  - Merge branch 'ab/config-based-hooks-base' into es/config-based-hooks
>  (this branch uses ab/config-based-hooks-base.)
>
>  Revamp the hooks subsystem to allow multiple of them to trigger
>  upon the same event and control via the configuration variables.
>
>  Expecting a reroll
>  but ab/config-based-hooks-base needs to be in a better shape first.
>  cf. <87v93wflm0.fsf@evledraar.gmail.com>
>  cf. <87tuj7xhqo.fsf@evledraar.gmail.com>

... I'll submit my version of this on top of my not-yet-picked-up (due
to a conflict with this stale topic) ab/config-based-hooks-base, pending
Emily's canonical version of that..

> * jh/builtin-fsmonitor (2021-09-03) 37 commits
> [...]
> Expecting a reroll post 2.33 release.

Per your "I may start discarding too ancient topics to nudge the authors
to resubmit updates to them" above I've got one one-patch series cleanup
that's been blocked by a conflict with this for a long time. Perhaps a
candidate for ejection until the re-roll materializes?

> * ab/fsck-unexpected-type (2021-09-07) 22 commits
> [...]
>
>  "git fsck" has been taught to report mismatch between expected and
>  actual types of an object better.
>
>  Needs review.

Indeed, any takers? It's been cooking for a long time and I think it
should be well tested / mature at this point, but if there's no takers I
might need to split it up and submit it incrementally. I haven't thought
of a way to do that that doesn't make it more confusing, e.g. just the
tests or just some of the prep work is a "bridge to nowhere" without the
end parts of it...

> * gh/gitweb-branch-sort (2021-06-10) 1 commit
>  - gitweb: use HEAD as secondary sort key in git_get_heads_list()
>
>  Tie-break branches that point at the same object in the list of
>  branches on GitWeb to show the one pointed at by HEAD early.
>
>  Will merge to 'next'.

Nice!

> * js/retire-preserve-merges (2021-09-07) 11 commits
> [...]
>  The "--preserve-merges" option of "git rebase" has been removed.
>
>  Will merge to 'next'?

I agree that that would be nice, and re
https://lore.kernel.org/git/nycvar.QRO.7.76.6.2109091307070.59@tvgsbejvaqbjf.bet/
think it would be fine for that to happen sooner than later, but if
Johannes would prefer to wait a while...

> * ab/gc-log-rephrase (2021-09-02) 1 commit
>  Will merge to 'master'.
> * ab/mailmap-leakfix (2021-08-31) 1 commit
>  Will merge to 'master'.
> * ba/object-info (2021-08-31) 1 commit
>  Will merge to 'master'.

Thanks!

> * ab/commit-graph-usage (2021-08-30) 7 commits
> [...]
>  Will merge to 'master'.

Thanks, I've got some more parse_options() fixes waiting on this.

> * ab/ls-remote-packet-trace (2021-08-24) 1 commit
>  Will merge to 'master'.
> * ab/rebase-fatal-fatal-fix (2021-08-24) 1 commit
>  Will merge to 'master'.

Thanks!

> * ab/refs-errno-cleanup (2021-08-25) 4 commits
>  - refs: make errno output explicit for refs_resolve_ref_unsafe
>  - refs: explicitly return failure_errno from parse_loose_ref_contents
>  - branch tests: test for errno propagating on failing read
>  - refs: add failure_errno to refs_read_raw_ref() signature
>  (this branch uses ab/refs-files-cleanup and hn/refs-errno-cleanup.)
>
>  The "remainder" of hn/refs-errno-cleanup topic.

It would be nice to get some movement on this and the dependant topics,
per my https://lore.kernel.org/git/8735qnax0o.fsf@evledraar.gmail.com/

> * ab/retire-advice-config (2021-08-25) 4 commits
> [...]
>  Will merge to 'master'.

Thanks. I've also got some more advice fixes waiting on this.

> * js/maintenance-launchctl-fix (2021-08-24) 2 commits
> [...]
>  Will merge to 'master'.

Merged already I see, I have a trivial fix-on-top at
https://lore.kernel.org/git/patch-1.1-93adb856b0c-20210909T012244Z-avarab@gmail.com/

> * jv/pkt-line-batch (2021-09-01) 2 commits
>  - upload-pack: use stdio in send_ref callbacks
>  - pkt-line: add stdio packet write functions
>
>  Reduce number of write(2) system calls while sending the
>  ref advertisement.
>
>  Will merge to 'next'?

LGTM!

> * ab/unbundle-progress (2021-09-07) 4 commits
>  - bundle: show progress on "unbundle"
>  - index-pack: add --progress-title option
>  - bundle API: change "flags" to be "extra_index_pack_args"
>  - bundle API: start writing API documentation
>
>  Add progress display to "git bundle unbundle".
>
>  Will merge to 'next'?

I think so, the last re-roll was small, reduced net complexity, and
addressed all outstanding feedback.

> * ab/lib-subtest (2021-08-05) 11 commits
>  - test-lib tests: assert 1 exit code, not non-zero
>  - test-lib tests: refactor common part of check_sub_test_lib_test*()
>  - test-lib tests: avoid subshell for "test_cmp" for readability
>  - test-lib tests: assert no copy/pasted mock test code
>  - test-lib tests: get rid of copy/pasted mock test code
>  - test-lib tests: don't provide a description for the sub-tests
>  - test-lib tests: stop using a subshell in write_sub_test_lib_test()
>  - test-lib tests: split up "write and run" into two functions
>  - test-lib tests: move "run_sub_test" to a new lib-subtest.sh
>  - Merge branch 'ps/t0000-output-directory-fix' into ab/lib-subtest
>  - Merge branch 'jk/t0000-subtests-fix' into ab/lib-subtest
>
>  Updates to the tests in t0000 to test the test framework.

Would be nice to get movement on this, any takers for reviews? Perhaps I
should re-submit it.

> * ab/only-single-progress-at-once (2021-07-23) 8 commits
>  - progress.c: add & assert a "global_progress" variable
>  - pack-bitmap-write.c: add a missing stop_progress()
>  - progress.c: add temporary variable from progress struct
>  - progress.c: stop eagerly fflush(stderr) when not a terminal
>  - progress.c: call progress_interval() from progress_test_force_update()
>  - progress.c: move signal handler functions lower
>  - progress.c tests: test some invalid usage
>  - progress.c tests: make start/stop verbs on stdin
>
>  Further tweaks on progress API.
>
>  On hold.
>  cf. <20210901050406.GB76263@szeder.dev>

SZEDER: Any hints as to what that issue is or how to reproduce it?

> * ab/progress-users-adjust-counters (2021-08-25) 2 commits
>  - entry: show finer-grained counter in "Filtering content" progress line
>  - commit-graph: fix bogus counter in "Scanning merged commits" progress line
>
>  The code to show progress indicator in a few codepaths did not
>  cover between 0-100%, which has been corrected.
>
>  Will merge to 'next'?

Sounds good, I re-rolled this at
https://lore.kernel.org/git/cover-v4-0.2-00000000000-20210909T010722Z-avarab@gmail.com/
to fix a relatively trivial and new conflict with "master", t omake that
easier.

> * ab/make-tags-cleanup (2021-08-05) 5 commits
> [...]
>  Build clean-up for "make tags" and friends.
>
>  Will merge to 'next'?

I think it's ready & has all previous feedback addressed.

> * ab/config-based-hooks-base (2021-08-03) 36 commits
> [...]
>  (this branch is used by es/config-based-hooks.)
>
>  Restructuring of (a subset of) Emily's config-based-hooks series,
>  to demonstrate that a series can be presented as a more logical and
>  focused progression.
>
>  Waiting for reviews.

Per note on es/config-based-hooks above this is the v4 that's replaced
by my not-yet-picked-up due to conflict with es/config-based-hooks v5.

> * ab/serve-cleanup (2021-08-05) 10 commits
>  - upload-pack: document and rename --advertise-refs
>  - serve.[ch]: remove "serve_options", split up --advertise-refs code
>  - {upload,receive}-pack tests: add --advertise-refs tests
>  - serve.c: move version line to advertise_capabilities()
>  - serve: move transfer.advertiseSID check into session_id_advertise()
>  - serve.[ch]: don't pass "struct strvec *keys" to commands
>  - serve: use designated initializers
>  - transport: use designated initializers
>  - transport: rename "fetch" in transport_vtable to "fetch_refs"
>  - serve: mark has_capability() as static
>
>  Code clean-up around "git serve".
>
>  Will merge to 'next'?

That would be very nice, I think it's received thorough reviews of the
relevant parts that still remain, and the whole "config callback"
mechanism people were on the fence about has been entirely ejected.

> * ab/pack-objects-stdin (2021-07-09) 5 commits
>  - pack-objects.c: make use of REV_INFO_STDIN_LINE_PROCESS
>  - pack-objects.c: do stdin parsing via revision.c's API
>  - revision.[ch]: add a "handle_stdin_line" API
>  - revision.h: refactor "disable_stdin" and "read_from_stdin"
>  - upload-pack: run is_repository_shallow() before setup_revisions()
>
>  Introduce handle_stdin_line callback to revision API and uses it.
>
>  Waiting for reviews.

Per https://lore.kernel.org/git/8735qnax0o.fsf@evledraar.gmail.com/ I'd
prefer to have this reviewed & go in in isolation, but per the note
there if there's no interest perhaps I'll re-submit a larger version of
this that implements the "refs and tips on stdin to git bundle" that I
created this for.

> * ab/refs-files-cleanup (2021-08-25) 13 commits
>  - refs/files: remove unused "errno != ENOTDIR" condition
>  - refs/files: remove unused "errno == EISDIR" code
>  - refs/files: remove unused "oid" in lock_ref_oid_basic()
>  - refs API: remove OID argument to reflog_expire()
>  - reflog expire: don't lock reflogs using previously seen OID
>  - refs/files: add a comment about refs_reflog_exists() call
>  - refs: make repo_dwim_log() accept a NULL oid
>  - refs/debug: re-indent argument list for "prepare"
>  - refs/files: remove unused "skip" in lock_raw_ref() too
>  - refs/files: remove unused "extras/skip" in lock_ref_oid_basic()
>  - refs: drop unused "flags" parameter to lock_ref_oid_basic()
>  - refs/files: remove unused REF_DELETING in lock_ref_oid_basic()
>  - refs/packet: add missing BUG() invocations to reflog callbacks
>  (this branch is used by ab/refs-errno-cleanup and hn/refs-errno-cleanup.)
>
>  Continued work on top of the hn/refs-errno-cleanup topic.
>
>
> * hn/refs-errno-cleanup (2021-08-25) 4 commits
>  - refs: make errno output explicit for read_raw_ref_fn
>  - refs/files-backend: stop setting errno from lock_ref_oid_basic
>  - refs: remove EINVAL errno output from specification of read_raw_ref_fn
>  - refs file backend: move raceproof_create_file() here
>  (this branch is used by ab/refs-errno-cleanup; uses ab/refs-files-cleanup.)
>
>  Futz with the way 'errno' is relied on in the refs API to carry the
>  failure modes up the callchain.

I think these should be ready for merger down, also per the note in last
week's What's Cooking at
https://lore.kernel.org/git/8735qnax0o.fsf@evledraar.gmail.com/

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Elijah Newren]

A few comments on some topics from other folks...

On Wed, Sep 8, 2021 at 8:40 AM Junio C Hamano <gitster@pobox.com> wrote:

> * pb/test-use-user-env (2021-09-07) 3 commits
>  - test-lib-functions: keep user's debugger config files and TERM in 'debug'
>  - test-lib-functions: optionally keep HOME, TERM and SHELL in 'test_pause'
>  - test-lib-functions: use 'TEST_SHELL_PATH' in 'test_pause'
>
>  Teach test_pause and test_debug to allow using the HOME and TERM
>  environment variables the user usually uses.
>
>  Will merge to 'next'?

Sounds good to me; I'm happy with the latest series.

> * js/retire-preserve-merges (2021-09-07) 11 commits
>  - sequencer: restrict scope of a formerly public function
>  - rebase: remove a no-longer-used function
>  - rebase: stop mentioning the -p option in comments
>  - rebase: remove obsolete code comment
>  - rebase: drop the internal `rebase--interactive` command
>  - git-svn: drop support for `--preserve-merges`
>  - rebase: drop support for `--preserve-merges`
>  - pull: remove support for `--rebase=preserve`
>  - tests: stop testing `git rebase --preserve-merges`
>  - remote: warn about unhandled branch.<name>.rebase values
>  - t5520: do not use `pull.rebase=preserve`
>
>  The "--preserve-merges" option of "git rebase" has been removed.
>
>  Will merge to 'next'?

I came a bit late to the party, but skimmed over the series as well.
I'm very happy with the cleanups.  The direction of the patches looks
good in general, and didn't spot any problems in my spot checking.
Merging down sounds good to me.

> * ds/sparse-index-ignored-files (2021-09-07) 10 commits
>  - sparse-checkout: clear tracked sparse dirs
>  - sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag
>  - attr: be careful about sparse directories
>  - sparse-checkout: create helper methods
>  - sparse-index: use WRITE_TREE_MISSING_OK
>  - sparse-index: silently return when cache tree fails
>  - unpack-trees: fix nested sparse-dir search
>  - sparse-index: silently return when not using cone-mode patterns
>  - t7519: rewrite sparse index test
>  - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
>  (this branch is used by sg/test-split-index-fix.)
>
>  In cone mode, the sparse-index codepath learned to remove ignored
>  files (like build artifacts) outside the sparse cone, allowing the
>  entire directory outside the sparse cone to be removed, which is
>  especially useful when the sparse patterns change.
>
>  Will merge to 'next'?

I've reviewed each of the rounds in detail and I'm happy with this
one; I think it's ready.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Elijah Newren]

On Wed, Sep 8, 2021 at 2:57 PM Derrick Stolee <stolee@gmail.com> wrote:
>
> On 9/8/2021 11:38 AM, Junio C Hamano wrote:> * ds/sparse-index-ignored-files (2021-09-07) 10 commits
> >  - sparse-checkout: clear tracked sparse dirs
> >  - sparse-index: add SPARSE_INDEX_MEMORY_ONLY flag
> >  - attr: be careful about sparse directories
> >  - sparse-checkout: create helper methods
> >  - sparse-index: use WRITE_TREE_MISSING_OK
> >  - sparse-index: silently return when cache tree fails
> >  - unpack-trees: fix nested sparse-dir search
> >  - sparse-index: silently return when not using cone-mode patterns
> >  - t7519: rewrite sparse index test
> >  - Merge branch 'ds/add-with-sparse-index' into ds/sparse-index-ignored-files
> >  (this branch is used by sg/test-split-index-fix.)
> >
> >  In cone mode, the sparse-index codepath learned to remove ignored
> >  files (like build artifacts) outside the sparse cone, allowing the
> >  entire directory outside the sparse cone to be removed, which is
> >  especially useful when the sparse patterns change.
> >
> >  Will merge to 'next'?
>
> I think this one is ready to go. Elijah chimed in on the latest
> version, too.

Yep, looks good to me.

> This also means that perhaps we could start tracking the sparse
> index integrations with merge, rebase, cherry-pick, and revert [1]?
> This series has also had quite a bit of review, but the latest
> version has not had an ack.
>
> [1] https://lore.kernel.org/git/pull.1019.v3.git.1631100241.gitgitgadget@gmail.com

v2 was already nearly ready to go, with just some very minor comments
and questions.  Your email responses to individual patches explained
most of the remaining bits, leaving just the typo, which you corrected
in v3.  So, I went ahead and put my Reviewed-by on it.

If this series had been picked up by Junio and listed in the "What's
cooking" email, I'd suggest it was also ready for next.

> I also plan to send a new version of the --sparse RFC [2], which
> is based on [1]. I don't want to get too far ahead of what the
> community has capacity to review.
>
> [2] https://lore.kernel.org/git/pull.1018.git.1629842085.gitgitgadget@gmail.com/

Sorry for not responding.  I found a simple typo but wanted to have
something more to say than just that.  I was happy with what looked
like the high level direction, and then noticed that Matheus was
giving you lots of good comments and he understood some of the details
better than me.  I'll try to find some time to review when you send
the re-roll.

Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Ramsay Jones <ramsay@ramsayjones.plus.com> writes:

> On 08/09/2021 16:38, Junio C Hamano wrote:
>
> test t5319-multi-pack-index.sh on 'seen' has been failing for
> several days, so I had a quick look tonight. This issue relates
> to the following two topics:
> ...
> The merge commit 24cade3ceb ("Merge branch 'jb/midx-revindex-fix' into seen",
> 2021-09-07) basically takes two versions of the same patch and keeps both
> versions of the same test. The two patches are:
> ...
> The second patch even includes an acknowledgment of 'Original-patch-by:
> Johannes Berg <johannes@sipsolutions.net>' (ie the first patch).

You're right.
Thanks for helping me straighten the mess.

Re: js/retire-preserve-merges, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Wed, 8 Sep 2021, Junio C Hamano wrote:
>
>> * js/retire-preserve-merges (2021-09-07) 11 commits
>>  - sequencer: restrict scope of a formerly public function
>>  - rebase: remove a no-longer-used function
>>  - rebase: stop mentioning the -p option in comments
>>  - rebase: remove obsolete code comment
>>  - rebase: drop the internal `rebase--interactive` command
>>  - git-svn: drop support for `--preserve-merges`
>>  - rebase: drop support for `--preserve-merges`
>>  - pull: remove support for `--rebase=preserve`
>>  - tests: stop testing `git rebase --preserve-merges`
>>  - remote: warn about unhandled branch.<name>.rebase values
>>  - t5520: do not use `pull.rebase=preserve`
>>
>>  The "--preserve-merges" option of "git rebase" has been removed.
>>
>>  Will merge to 'next'?
>
> I think so, given the rate of reviews still trickling in tending toward
> zero.

We need to be careful about making our decision on such a trend.
For a later iteration, the lack of comments does not give us much
information.  It can happen if all the comments have adequately been
addressed, but it also can happen if none of the suggestions given
in earlier rounds are addressed---the reviewers can easily give up
and leave.

I think I've followed the topic well enough to tell that it is the
former for this instance (i.e. the patches have been polished well
enough).  Let's merge to 'next' so that we can keep it there long
enough.

Thanks.

> We probably want to keep it in `next` for quite a while, too, to make sure
> that people get the memo.
>
> Ciao,
> Dscho

Re: mr/bisect-in-c-4, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Wed, 8 Sep 2021, Junio C Hamano wrote:
>
>> * mr/bisect-in-c-4 (2021-09-02) 6 commits
>>  - bisect--helper: retire `--bisect-next-check` subcommand
>>  - bisect--helper: reimplement `bisect_run` shell
>>  - bisect--helper: reimplement `bisect_visualize()`shell function in C
>>  - run-command: make `exists_in_PATH()` non-static
>>  - t6030-bisect-porcelain: add test for bisect visualize
>>  - t6030-bisect-porcelain: add tests to control bisect run exit cases
>>
>>  Rewrite of "git bisect" in C continues.
>
> From my point of view, this is ready for `next`.

You agreed that redirection with dup2()'s in [5/6] was good enough
for now [*1*], but in that case, we need to add a few fflush(stdout)
around the dup2() dance [*2*].

So this is not quite ready for 'next' yet, although it is almost
there, I'd think.


[References]

*1* https://lore.kernel.org/git/nycvar.QRO.7.76.6.2109090922310.55@tvgsbejvaqbjf.bet/

*2* https://lore.kernel.org/git/xmqqtuj2h7cp.fsf@gitster.g/

Re: ar/submodule-add-more, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> Hi Junio,
>
> On Wed, 8 Sep 2021, Junio C Hamano wrote:
>
>> * ar/submodule-add-more (2021-08-10) 10 commits
>>  - submodule--helper: rename compute_submodule_clone_url()
>>  - submodule--helper: remove resolve-relative-url subcommand
>>  - submodule--helper: remove add-config subcommand
>>  - submodule--helper: remove add-clone subcommand
>>  - submodule--helper: convert the bulk of cmd_add() to C
>>  - dir: libify and export helper functions from clone.c
>>  - submodule--helper: remove repeated code in sync_submodule()
>>  - submodule--helper: refactor resolve_relative_url() helper
>>  - submodule--helper: add options for compute_submodule_clone_url()
>>  - Merge branch 'ar/submodule-add-config' into ar/submodule-add
>>  (this branch uses ar/submodule-add-config.)
>>
>>  More parts of "git submoudle add" has been rewritten in C.
>>
>>  Will merge to 'next'.
>
> If you use the description in the release notes, please
> `s/submoudle/submodule/` first.

Thank you.

Re: js/scalar, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Junio C Hamano]

Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:

> On Wed, 8 Sep 2021, Junio C Hamano wrote:
>
>> * js/scalar (2021-09-03) 15 commits
>>  ...
>>
>>  Add pieces from "scalar" to contrib/.
>
> Thank you for picking it up. It seems as if the reviews are starting to
> decrease to a point where I could imagine that we can start talking about
> how to refactor things to start bringing the benefits to Git proper.

For now I've given all what I thought about the patches I looked at,
and I think a handful other folks made comments on them.  I am not
keeping track of which comments have not yet been addressed, but it
seems that we hopefully do not need more than a couple more rounds.

Re: mr/bisect-in-c-4, was Re: What's cooking in git.git (Sep 2021, #02; Wed, 8)

[Johannes Schindelin]

Hi Junio,

On Thu, 9 Sep 2021, Junio C Hamano wrote:

> Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
>
> > On Wed, 8 Sep 2021, Junio C Hamano wrote:
> >
> >> * mr/bisect-in-c-4 (2021-09-02) 6 commits
> >>  - bisect--helper: retire `--bisect-next-check` subcommand
> >>  - bisect--helper: reimplement `bisect_run` shell
> >>  - bisect--helper: reimplement `bisect_visualize()`shell function in C
> >>  - run-command: make `exists_in_PATH()` non-static
> >>  - t6030-bisect-porcelain: add test for bisect visualize
> >>  - t6030-bisect-porcelain: add tests to control bisect run exit cases
> >>
> >>  Rewrite of "git bisect" in C continues.
> >
> > From my point of view, this is ready for `next`.
>
> You agreed that redirection with dup2()'s in [5/6] was good enough
> for now [*1*], but in that case, we need to add a few fflush(stdout)
> around the dup2() dance [*2*].
>
> So this is not quite ready for 'next' yet, although it is almost
> there, I'd think.

Oh right, I fogot about the `fflush()` stuff.

Thanks,
Dscho

>
>
> [References]
>
> *1* https://lore.kernel.org/git/nycvar.QRO.7.76.6.2109090922310.55@tvgsbejvaqbjf.bet/
>
> *2* https://lore.kernel.org/git/xmqqtuj2h7cp.fsf@gitster.g/
>