What's cooking in git.git (Dec 2022, #05; Wed, 14)

What's cooking in git.git (Dec 2022, #05; Wed, 14)

[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', and aren't
considered "accepted" at all.  A topic without enough support may be
discarded after a long period of no activity.

The first batch of topics have graduated from 'next' to 'master'.

In the past, I tried to re-examine all the topics in 'next' myself
to pick and choose the ones to be kept before rewinding and
rebuilding 'next' after each release, which took me a while.  This
time, to share the burden to expedite the process, I'll reset 'next'
to 'master' without any topics merged, and rely on input from list
participants.

The topics that used to be in 'next' are all marked as "Will merge
back to 'next'", but people can tell me to give them a chance to
reboot their topics, instead of piling "oops, that was wrong" fixes
on top, while I wait for such an input for the coming days.

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/various-leak-fixes (2022-11-21) 16 commits
  (merged to 'next' on 2022-11-21 at eff484a27c)
 + built-ins: use free() not UNLEAK() if trivial, rm dead code
 + revert: fix parse_options_concat() leak
 + cherry-pick: free "struct replay_opts" members
 + rebase: don't leak on "--abort"
 + connected.c: free the "struct packed_git"
 + sequencer.c: fix "opts->strategy" leak in read_strategy_opts()
 + ls-files: fix a --with-tree memory leak
 + revision API: call graph_clear() in release_revisions()
 + unpack-file: fix ancient leak in create_temp_file()
 + built-ins & libs & helpers: add/move destructors, fix leaks
 + dir.c: free "ident" and "exclude_per_dir" in "struct untracked_cache"
 + read-cache.c: clear and free "sparse_checkout_patterns"
 + commit: discard partial cache before (re-)reading it
 + {reset,merge}: call discard_index() before returning
 + tests: mark tests as passing with SANITIZE=leak
 + Merge branch 'pw/rebase-no-reflog-action' into ab/various-leak-fixes

 Various leak fixes.
 source: <cover-v2-00.15-00000000000-20221108T172650Z-avarab@gmail.com>


* dd/git-bisect-builtin (2022-11-15) 13 commits
  (merged to 'next' on 2022-11-15 at e16e754058)
 + bisect; remove unused "git-bisect.sh" and ".gitignore" entry
  (merged to 'next' on 2022-11-14 at fc304fb52f)
 + Turn `git bisect` into a full built-in
 + bisect--helper: log: allow arbitrary number of arguments
 + bisect--helper: handle states directly
 + bisect--helper: emit usage for "git bisect"
 + bisect test: test exit codes on bad usage
 + bisect--helper: identify as bisect when report error
 + bisect-run: verify_good: account for non-negative exit status
 + bisect run: keep some of the post-v2.30.0 output
 + bisect: fix output regressions in v2.30.0
 + bisect: refactor bisect_run() to match CodingGuidelines
 + bisect tests: test for v2.30.0 "bisect run" regressions
 + Merge branch 'dd/bisect-helper-subcommand' into dd/git-bisect-builtin

 `git bisect` becomes a builtin.
 source: <cover.1668097962.git.congdanhqx@gmail.com>


* js/t0021-windows-pwd (2022-12-07) 1 commit
  (merged to 'next' on 2022-12-08 at 63bc7701e8)
 + t0021: use Windows-friendly `pwd`
 (this branch is used by js/drop-mingw-test-cmp.)

 Test fix.
 source: <b38b8fb5a85e10d6189d68b6633adf23fca7b65d.1670339267.git.gitgitgadget@gmail.com>


* kz/merge-tree-merge-base (2022-11-25) 3 commits
  (merged to 'next' on 2022-11-25 at 298ca8e2e8)
 + docs: fix description of the `--merge-base` option
  (merged to 'next' on 2022-11-14 at 76d48ae21f)
 + merge-tree.c: allow specifying the merge-base when --stdin is passed
 + merge-tree.c: add --merge-base=<commit> option

 "merge-tree" learns a new `--merge-base` option.
 source: <pull.1397.v7.git.1668210314.gitgitgadget@gmail.com>
 source: <c21466d1db0e7f7fcd7308b61aa1e3cd4e3d67c4.1669261026.git.gitgitgadget@gmail.com>


* rs/multi-filter-args (2022-11-30) 5 commits
  (merged to 'next' on 2022-12-01 at 5848d16bb6)
 + list-objects-filter: remove OPT_PARSE_LIST_OBJECTS_FILTER_INIT()
 + pack-objects: simplify --filter handling
 + pack-objects: fix handling of multiple --filter options
 + t5317: demonstrate failure to handle multiple --filter options
 + t5317: stop losing return codes of git ls-files

 Fix a bug where `pack-objects` would not respect multiple `--filter`
 arguments when invoked directly.
 source: <c2d3e7a3-599f-dae5-8dde-dc969df39f02@web.de>


* sa/git-var-empty (2022-11-27) 2 commits
  (merged to 'next' on 2022-12-01 at 3b81dcb382)
 + var: allow GIT_EDITOR to return null
 + var: do not print usage() with a correct invocation

 "git var UNKNOWN_VARIABLE" and "git var VARIABLE" with the variable
 given an empty value used to behave identically.  Now the latter
 just gives an empty output, while the former still gives an error
 message.
 source: <pull.1434.v3.git.1669472277.gitgitgadget@gmail.com>


* tl/pack-bitmap-absolute-paths (2022-11-29) 4 commits
  (merged to 'next' on 2022-11-30 at cb5d17ee40)
 + pack-bitmap.c: trace bitmap ignore logs when midx-bitmap is found
 + pack-bitmap.c: break out of the bitmap loop early if not tracing
  (merged to 'next' on 2022-11-14 at 34eb0ea05a)
 + pack-bitmap.c: avoid exposing absolute paths
 + pack-bitmap.c: remove unnecessary "open_pack_index()" calls

 The pack-bitmap machinery is taught to log the paths of redundant
 bitmap(s) to trace2 instead of stderr.
 source: <cover.1669644101.git.dyroneteng@gmail.com>


* yn/git-jump-emacs (2022-11-27) 3 commits
  (merged to 'next' on 2022-11-29 at d0960938a0)
 + git-jump: invoke emacs/emacsclient
 + git-jump: move valid-mode check earlier
 + git-jump: add an optional argument '--stdout'

 "git jump" (in contrib/) learned to present the "quickfix list" to
 its standard output (instead of letting it consumed by the editor
 it invokes), and learned to also drive emacs/emacsclient.
 source: <pull.1423.v8.git.1669511933.gitgitgadget@gmail.com>

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

* ds/bundle-uri-4-fixup (2022-12-13) 3 commits
 - bundle-uri: remove GIT_TEST_BUNDLE_URI env variable
 - bundle-uri: advertise based on repo config
 - bundle-uri: drop unused 'uri' parameter
 (this branch uses ds/bundle-uri-4.)

 Incremental fixes on ds/bundle-uri-4 topic.

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


* ds/omit-trailing-hash-in-index (2022-12-13) 4 commits
 - features: feature.manyFiles implies fast index writes
 - test-lib-functions: add helper for trailing hash
 - read-cache: add index.skipHash config option
 - hashfile: allow skipping the hash function

 Introduce an optional configuration to allow the trailing hash that
 protects the index file from bit flipping.

 Will merge to 'next'.
 source: <pull.1439.v2.git.1670862677.gitgitgadget@gmail.com>


* jk/server-supports-v2-cleanup (2022-12-13) 1 commit
 - server_supports_v2(): use a separate function for die_on_error

 Code clean-up.

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


* jk/unused-post-2.39 (2022-12-13) 9 commits
 - userdiff: mark unused parameter in internal callback
 - list-objects-filter: mark unused parameters in virtual functions
 - diff: mark unused parameters in callbacks
 - xdiff: mark unused parameter in xdl_call_hunk_func()
 - xdiff: drop unused parameter in def_ff()
 - ws: drop unused parameter from ws_blank_line()
 - list-objects: drop process_gitlink() function
 - blob: drop unused parts of parse_blob_buffer()
 - ls-refs: use repository parameter to iterate refs

 Code clean-up around unused function parameters.

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


* jt/http-fetch-trace2-report-name (2022-12-13) 1 commit
 - http-fetch: invoke trace2_cmd_name()

 "git http-fetch" (which is rarely used) forgot to identify itself
 in the trace2 output.

 Will merge to 'next'.
 source: <20221212224630.2553391-1-jonathantanmy@google.com>


* rs/am-parse-options-cleanup (2022-12-13) 1 commit
 - am: don't pass strvec to apply_parse_options()

 Will merge to 'next'.
 Code clean-up.
 source: <baf93e4a-7f05-857c-e551-09675496c03c@web.de>


* rs/clarify-error-in-write-loose-object (2022-12-14) 1 commit
 - object-file: inline write_buffer()

 Code clean-up.

 Will merge to 'next'.
 source: <94dff140-489c-40b2-7212-201ed3b7d008@web.de>


* rs/clear-commit-marks-cleanup (2022-12-13) 1 commit
 - commit: skip already cleared parents in clear_commit_marks_1()

 Code clean-up.

 Will merge to 'next'.
 source: <7cf2ea1f-8dbf-5639-3874-86de391ae20a@web.de>


* rs/reflog-expiry-cleanup (2022-12-13) 1 commit
 - reflog: clear leftovers in reflog_expiry_cleanup()

 Code clean-up.

 Will merge to 'next'.
 source: <a53d4df3-4b2c-585a-e8ad-2a9b9017fb8c@web.de>


* sg/help-autocorrect-config-fix (2022-12-13) 1 commit
 - help.c: fix autocorrect in work tree for bare repository

 The code to auto-correct a misspelt subcommand unnecessarily called
 into git_default_config() from the early config codepath, which was
 a no-no.  This has bee corrected.

 Will merge to 'next'.
 source: <pull.1373.v2.git.git.1667073374852.gitgitgadget@gmail.com>

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

* pw/test-todo (2022-10-06) 3 commits
 . test_todo: allow [verbose] test as the command
 . test_todo: allow [!] grep as the command
 . tests: add test_todo() to mark known breakages

 RFC for test framework improvement.

 Needs review.
 source: <pull.1374.git.1665068476.gitgitgadget@gmail.com>


* cw/submodule-status-in-parallel (2022-11-08) 6 commits
 - diff-lib: parallelize run_diff_files for submodules
 - diff-lib: refactor match_stat_with_submodule
 - submodule: move status parsing into function
 - submodule: strbuf variable rename
 - run-command: add duplicate_output_fn to run_processes_parallel_opts
 - Merge branch 'ab/run-hook-api-cleanup' into cw/submodule-status-in-parallel

 Allow the internal "diff-files" engine to run "how has this
 submodule changed?" in parallel to speed up "git status".

 Waiting for review.
 source: <20221020232532.1128326-1-calvinwan@google.com>


* es/doc-creation-factor-fix (2022-07-28) 2 commits
 . range-diff: clarify --creation-factor=<factor>
 . format-patch: clarify --creation-factor=<factor>

 Expecting a reroll by somebody more familiar with the logic
 cf. <xmqqo7wfix7p.fsf@gitster.g>
 source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr>

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

* ed/fsmonitor-inotify (2022-12-13) 6 commits
 - fsmonitor: update doc for Linux
 - fsmonitor: test updates
 - fsmonitor: enable fsmonitor for Linux
 - fsmonitor: implement filesystem change listener for Linux
 - fsmonitor: determine if filesystem is local or remote
 - fsmonitor: prepare to share code between Mac OS and Linux

 Bundled fsmonitor for Linux using inotify API.

 Needs review on the updated round.
 source: <pull.1352.v5.git.git.1670882286.gitgitgadget@gmail.com>


* rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit
 - t3920: support CR-eating grep
 (this branch uses js/t3920-shell-and-or-fix.)

 Test fix.

 Will merge back to 'next'.
 source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>


* es/t1509-root-fixes (2022-12-09) 3 commits
 - t1509: facilitate repeated script invocations
 - t1509: make "setup" test more robust
 - t1509: fix failing "root work tree" test due to owner-check

 source: <pull.1425.git.1668999621.gitgitgadget@gmail.com>


* ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
 - t4023: fix ignored exit codes of git

 Test fix.

 Will merge back to 'next'.
 source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>


* jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
 - fsmonitor: fix race seen in t7527

 Make fsmonitor more robust to avoid the flakiness seen in t7527.

 Will merge back to 'next'.
 source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>


* rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
 - list-objects-filter: plug pattern_list leak

 Leak fix.

 Will merge back to 'next'.
 source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>


* rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
 - t4205: don't exit test script on failure

 Test fix.

 Will merge back to 'next'.
 source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>


* ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
 - t5314: check exit code of "git"

 Test fix.

 Will merge back to 'next'.
 source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>


* ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
 - t7600: don't ignore "rev-parse" exit code in helper

 Test fix.

 Will merge back to 'next'.
 source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>


* jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
 - fsmonitor: eliminate call to deprecated FSEventStream function

 Stop using deprecated macOS API in fsmonitor.

 Will merge back to 'next'.
 source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>


* js/t3920-shell-and-or-fix (2022-12-05) 1 commit
 - t3920: don't ignore errors of more than one command with `|| true`
 (this branch is used by rs/t3920-crlf-eating-grep-fix.)

 Test fix.

 Will merge back to 'next'.
 source: <febcfb0a-c410-fb71-cff9-92acfcb269e2@kdbg.org>


* sx/pthread-error-check-fix (2022-12-05) 1 commit
 - maintenance: compare output of pthread functions for inequality with 0

 Correct pthread API usage.

 Will merge back to 'next'.
 source: <pull.1389.git.git.1670000578395.gitgitgadget@gmail.com>


* jk/avoid-redef-system-functions (2022-12-05) 3 commits
 - Merge branch 'jk/avoid-redef-system-functions-2.30' into jk/avoid-redef-system-functions
 - Merge branch 'jk/avoid-redef-system-functions-2.30'
 - Merge branch 'jk/avoid-redef-system-functions-2.30' into maint
 (this branch uses jk/avoid-redef-system-functions-2.30.)

 The jk/avoid-redef-system-functions-2.30 topic pre-merged for more
 recent codebase.

 Will merge back to 'next'.


* jk/avoid-redef-system-functions-2.30 (2022-12-05) 2 commits
 - git-compat-util: undefine system names before redeclaring them
 - git-compat-util: avoid redefining system function names
 (this branch is used by jk/avoid-redef-system-functions.)

 Redefining system functions for a few functions did not follow our
 usual "implement git_foo() and #define foo(args) git_foo(args)"
 pattern, which has broken build for some folks.

 Will merge back to 'next'.
 source: <Y4fH4rhcSztHwKvK@coredump.intra.peff.net>
 source: <Y4RAr04vS/TOM5uh@coredump.intra.peff.net>


* jt/avoid-lazy-fetch-commits (2022-12-13) 4 commits
 - commit: don't lazy-fetch commits
 - object-file: emit corruption errors when detected
 - object-file: refactor map_loose_object_1()
 - object-file: remove OBJECT_INFO_IGNORE_LOOSE

 Even in a repository with promissor remote, it is useless to
 attempt to lazily attempt fetching an object that is expected to be
 commit, because no "filter" mode omits commit objects.  Take
 advantage of this assumption to fail fast on errors.

 Will merge to 'next'?
 source: <cover.1670885252.git.jonathantanmy@google.com>


* rs/diff-parseopts (2022-12-02) 3 commits
 - diff: remove parseopts member from struct diff_options
 - diff: use add_diff_options() in diff_opt_parse()
 - diff: factor out add_diff_options()

 The way the diff machinery prepares the options array for the
 parse_options API has been refactored to avoid resource leaks.

 Will merge back to 'next'.
 source: <19325420-5630-87bb-0c2c-362151214b36@web.de>


* jx/t1301-updates (2022-11-30) 3 commits
 - t1301: do not change $CWD in "shared=all" test case
 - t1301: use test_when_finished for cleanup
 - t1301: fix wrong template dir for git-init

 Test updates.
 source: <20221128130323.8914-1-worldhello.net@gmail.com>


* km/send-email-with-v-reroll-count (2022-11-30) 2 commits
 - SQUASH???
 - send-email: relay '-v N' to format-patch

 "git send-email -v 3" used to be expanded to "git send-email
 --validate 3" when the user meant to pass them down to
 "format-patch", which has been corrected.

 Seems to break CI.
 source: <87edtp5uws.fsf@kyleam.com>


* so/diff-merges-more (2022-11-30) 6 commits
 - SQUASH??? cocci fix
 - diff-merges: issue warning on lone '-m' option
 - diff-merges: support list of values for --diff-merges
 - diff-merges: implement log.diffMergesForce config
 - diff-merges: implement log.diffMerges-m-imply-p config
 - diff-merges: implement [no-]hide option and log.diffMergesHide config

 Assorted updates to "--diff-merges=X" option.

 Seems to break CI.
 Cocci complains about "if (func_ptr != NULL)"
 cf. https://github.com/git/git/actions/runs/3583592108/jobs/6029213624
 source: <20221127093721.31012-1-sorganov@gmail.com>


* ab/config-multi-and-nonbool (2022-11-27) 9 commits
 - for-each-repo: with bad config, don't conflate <path> and <cmd>
 - config API: add "string" version of *_value_multi(), fix segfaults
 - config API users: test for *_get_value_multi() segfaults
 - for-each-repo: error on bad --config
 - config API: have *_multi() return an "int" and take a "dest"
 - versioncmp.c: refactor config reading next commit
 - config tests: add "NULL" tests for *_get_value_multi()
 - config tests: cover blind spots in git_die_config() tests
 - for-each-repo tests: test bad --config keys

 Assorted config API updates.

 Waiting for review.
 source: <cover-v3-0.9-00000000000-20221125T093158Z-avarab@gmail.com>


* sa/cat-file-mailmap--batch-check (2022-12-02) 2 commits
 - cat-file: add mailmap support to --batch-check option
 - cat-file: add mailmap support to -s option

 'cat-file' gains mailmap support for its '--batch-check' and '-s'
 options.
 source: <20221201155504.320461-1-siddharthasthana31@gmail.com>


* ab/tag-object-type-errors (2022-11-22) 5 commits
 - tag: don't emit potentially incorrect "object is a X, not a Y"
 - tag: don't misreport type of tagged objects in errors
 - object tests: add test for unexpected objects in tags
 - object-file.c: free the "t.tag" in check_tag()
 - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors

 Hardening checks around mismatched object types when one of those
 objects is a tag.

 Needs review.
 source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com>


* js/range-diff-mbox (2022-11-23) 1 commit
 - range-diff: support reading mbox files

 'git range-diff' gained support for reading either side from an .mbox
 file instead of a revision range.

 Expecting review responses.
 source: <pull.1420.v3.git.1669108102092.gitgitgadget@gmail.com>


* rj/branch-copy-and-rename (2022-11-17) 1 commit
 - branch: force-copy a branch to itself via @{-1} is a no-op

 Fix a pair of bugs in 'git branch'.

 Will merge back to 'next'.
 source: <f0b2d46c-2e9c-2630-2870-8ed550dd1606@gmail.com>


* tr/am--no-verify (2022-12-01) 2 commits
 - SQUASH???
 - am: allow passing --no-verify flag

 Conditionally skip the pre-applypatch and applypatch-msg hooks when
 applying patches with 'git am'.

 Expecting a (hopefully final) reroll.
 source: <20221130172833.2662751-1-thierry.reding@gmail.com>


* ew/format-patch-mboxrd (2022-11-14) 1 commit
 - format-patch: add --mboxrd alias for --pretty=mboxrd

 Teach `format-patch` a convenient alias for `--pretty=mboxrd`.

 Waiting for discussion to settle.
 source: <20221114094114.18986-1-e@80x24.org>


* js/drop-mingw-test-cmp (2022-12-13) 1 commit
 - tests(mingw): avoid very slow `mingw_test_cmp`

 Use `git diff --no-index` as a test_cmp on Windows.

 Waiting for review response.
 source: <pull.1309.v5.git.1670339267.gitgitgadget@gmail.com>


* mc/switch-advice (2022-11-09) 1 commit
 - po: use `switch` over `checkout` in error message

 Use 'switch' instead of 'checkout' in an error message.

 Waiting for review response.
 source: <pull.1308.git.git.1668018620148.gitgitgadget@gmail.com>


* aw/complete-case-insensitive (2022-11-30) 2 commits
 - completion: add case-insensitive match of pseudorefs
 - completion: add optional ignore-case when matching refs

 Introduce a case insensitive mode to the Bash completion helpers.

 Will merge back to 'next'.
 source: <pull.1374.v2.git.git.1668990419.gitgitgadget@gmail.com>


* ja/worktree-orphan (2022-11-10) 2 commits
 - worktree add: add --orphan flag
 - worktree add: Include -B in usage docs

 'git worktree add' learned how to create a worktree based on an
 orphaned branch with `--orphan`.

 Expecting another round?
 source: <20221110233137.10414-1-jacobabel@nullpo.dev>


* tb/ci-concurrency (2022-11-08) 1 commit
 - ci: avoid unnecessary builds

 Avoid unnecessary builds in CI, with settings configured in
 ci-config.

 Waiting for review.
 source: <ff172f1de982f6f79b598e4ac6d5b2964ca4a098.1667931937.git.me@ttaylorr.com>


* tl/notes--blankline (2022-11-09) 5 commits
 - notes.c: introduce "--no-blank-line" option
 - notes.c: provide tips when target and append note are both empty
 - notes.c: drop unreachable code in 'append_edit()'
 - notes.c: cleanup for "designated init" and "char ptr init"
 - notes.c: cleanup 'strbuf_grow' call in 'append_edit'

 'git notes append' was taught '--[no-]blank-line' to conditionally
 add a LF between a new and existing note.

 Waiting for review.
 source: <cover.1667980450.git.dyroneteng@gmail.com>


* ds/bundle-uri-4 (2022-12-06) 11 commits
 - clone: unbundle the advertised bundles
 - bundle-uri: download bundles from an advertised list
 - bundle-uri: allow relative URLs in bundle lists
 - strbuf: introduce strbuf_strip_file_from_path()
 - bundle-uri: serve bundle.* keys from config
 - bundle-uri client: add helper for testing server
 - transport: rename got_remote_heads
 - bundle-uri client: add boolean transfer.bundleURI setting
 - clone: request the 'bundle-uri' command when available
 - t: create test harness for 'bundle-uri' command
 - protocol v2: add server-side "bundle-uri" skeleton
 (this branch is used by ds/bundle-uri-4-fixup.)

 Bundle URIs part 4.

 Will merge back to 'next'?
 source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>


* po/pretty-hard-trunc (2022-11-13) 1 commit
 - pretty-formats: add hard truncation, without ellipsis, options

 Add a new pretty format which truncates without ellipsis.

 Waiting for review.
 source: <20221112143616.1429-1-philipoakley@iee.email>


* rr/status-untracked-advice (2022-12-01) 1 commit
 - status: modernize git-status "slow untracked files" advice

 The advice message given by "git status" when it takes long time to
 enumerate untracked paths has been updated.

 Will merge back to 'next'.
 source: <pull.1384.v9.git.1669769536707.gitgitgadget@gmail.com>


* cc/filtered-repack (2022-11-23) 2 commits
 - repack: add --filter=<filter-spec> option
 - pack-objects: allow --filter without --stdout

 "git repack" learns to discard objects that ought to be retrievable
 again from the promissor remote.

 Needs review.
 Seems to break CI.
 cf. https://github.com/git/git/actions/runs/3560918726
 source: <20221122175150.366828-1-christian.couder@gmail.com>


* mc/credential-helper-auth-headers (2022-12-13) 8 commits
 - t5556: add HTTP authentication tests
 - test-http-server: add simple authentication
 - test-http-server: pass Git requests to http-backend
 - test-http-server: add HTTP request parsing
 - test-http-server: add HTTP error response function
 - test-http-server: add stub HTTP server test helper
 - credential: add WWW-Authenticate header to cred requests
 - http: read HTTP WWW-Authenticate response headers

 Extending credential helper protocol.

 Needs review.
 source: <pull.1352.v4.git.1670880984.gitgitgadget@gmail.com>

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

* gc/submodule-clone-update-with-branches (2022-10-30) 8 commits
 . clone, submodule update: create and check out branches
 . submodule--helper: remove update_data.suboid
 . submodule update: refactor update targets
 . submodule: return target of submodule symref
 . t5617: drop references to remote-tracking branches
 . submodule--helper clone: create named branch
 . repo-settings: add submodule_propagate_branches
 . clone: teach --detach option

 "git clone --recurse-submodules" and "git submodule update" learns
 to honor the "propagete branches" option.

 Retracted.
 cf. <xmqqedtl14xr.fsf@gitster.g>
 source: <pull.1321.v3.git.git.1666988096.gitgitgadget@gmail.com>


* ab/remove--super-prefix (2022-11-21) 12 commits
 . fetch: rename "--submodule-prefix" to "--super-prefix"
 . read-tree: add "--super-prefix" option, eliminate global
 . submodule--helper: convert "{update,clone}" to their own "--super-prefix"
 . submodule--helper: convert "status" to its own "--super-prefix"
 . submodule--helper: convert "sync" to its own "--super-prefix"
 . submodule--helper: convert "foreach" to its own "--super-prefix"
 . submodule--helper: don't use global --super-prefix in "absorbgitdirs"
 . submodule.c & submodule--helper: pass along "super_prefix" param
 . read-tree + fetch tests: test failing "--super-prefix" interaction
 . Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
 . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
 . Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix

 Remove the top-level `--super-prefix` option.
 Will discard.
 cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>
 source: <cover-v3-0.9-00000000000-20221119T122853Z-avarab@gmail.com>


* ab/submodule-no-abspath (2022-11-23) 2 commits
 . submodule absorbgitdirs: use relative <from> and <to> paths
 . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."

 Remove an absolute path in the "Migrating git directory" message.

 Revert out of 'next'.
 cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>
 source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>


* ab/cmake-nix-and-ci (2022-11-04) 14 commits
 . CI: add a "linux-cmake-test" to run cmake & ctest on linux
 . cmake: copy over git-p4.py for t983[56] perforce test
 . cmake: only look for "sh" in "C:/Program Files" on Windows
 . cmake: increase test timeout on Windows only
 . cmake: support GIT_TEST_OPTS, abstract away WIN32 defaults
 . Makefile + cmake: use environment, not GIT-BUILD-DIR
 . test-lib.sh: support a "GIT_TEST_BUILD_DIR"
 . cmake: set "USE_LIBPCRE2" in "GIT-BUILD-OPTIONS" for test-lib.sh
 . cmake & test-lib.sh: add a $GIT_SOURCE_DIR variable
 . cmake: chmod +x the bin-wrappers/* & SCRIPT_{SH,PERL} & git-p4
 . cmake: don't copy chainlint.pl to build directory
 . cmake: update instructions for portable CMakeLists.txt
 . cmake: use "-S" and "-B" to specify source and build directories
 . cmake: don't invoke msgfmt with --statistics

 Fix assorted issues with CTest on *nix machines.

 Revert out of 'next'.
 cf. <xmqq5yeuspam.fsf@gitster.g>
 source: <cover-v4-00.14-00000000000-20221103T160255Z-avarab@gmail.com>


* ms/sendemail-validate-headers (2022-11-11) 1 commit
 . Expose header information to git-send-email's sendemail-validate hook

 Expecting a reroll.
 Appears to break t9001 completely?
 source: <20221111194223.644845-2-michael.strawbridge@amd.com>


* hl/archive-recursive (2022-10-19) 10 commits
 . fixup! archive: add tests for git archive --recurse-submodules
 . archive: add tests for git archive --recurse-submodules
 . archive: add --recurse-submodules to git-archive command
 . archive: remove global repository from archive_args
 . archive: pass repo objects to write_archive handlers
 . tree: add repository parameter to read_tree_fn_t
 . tree: handle submodule case for read_tree_at properly
 . tree: increase test coverage for tree.c
 . tree: update cases to use repo_ tree methods
 . tree: do not use the_repository for tree traversal methods.

 "git archive" has been taught "--recurse-submodules" option to
 create a tarball that includes contents from submodules.

 Expecting a reroll.
 Seems to break win+VS test(8).
 cf. https://github.com/git/git/actions/runs/3293333066 whose only
 difference from https://github.com/git/git/actions/runs/3293553109
 is the inclusion of this topic.
 source: <pull.1359.v3.git.git.1665973401.gitgitgadget@gmail.com>


* js/bisect-in-c (2022-08-30) 17 commits
 . bisect: no longer try to clean up left-over `.git/head-name` files
 . bisect: remove Cogito-related code
 . Turn `git bisect` into a full built-in
 . bisect: move even the command-line parsing to `bisect--helper`
 . bisect--helper: make `state` optional
 . bisect--helper: calling `bisect_state()` without an argument is a bug
 . bisect: avoid double-quoting when printing the failed command
 . bisect run: fix the error message
 . bisect: verify that a bogus option won't try to start a bisection
 . bisect--helper: migrate to OPT_SUBCOMMAND()
 . bisect--helper: make the order consistently `argc, argv`
 . bisect--helper: make `terms` an explicit singleton
 . bisect--helper: simplify exit code computation
 . bisect--helper: really retire `--bisect-autostart`
 . bisect--helper: really retire --bisect-next-check
 . bisect--helper: retire the --no-log option
 . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c

 Final bits of "git bisect.sh" have been rewritten in C.

 Tired of waiting for too long.
 source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>


* ag/merge-strategies-in-c (2022-08-10) 14 commits
 . sequencer: use the "octopus" strategy without forking
 . sequencer: use the "resolve" strategy without forking
 . merge: use the "octopus" strategy without forking
 . merge: use the "resolve" strategy without forking
 . merge-octopus: rewrite in C
 . merge-recursive: move better_branch_name() to merge.c
 . merge-resolve: rewrite in C
 . merge-one-file: rewrite in C
 . update-index: move add_cacheinfo() to read-cache.c
 . merge-index: add a new way to invoke `git-merge-one-file'
 . merge-index: drop the index
 . merge-index: libify merge_one_path() and merge_all()
 . t6060: add tests for removed files
 . t6060: modify multiple files to expose a possible issue with merge-index

 An attempt to rewrite remaining merge strategies from shell to C.

 Tired of waiting for too long.
 source: <20220809185429.20098-1-alban.gruin@gmail.com>


* cw/remote-object-info (2022-08-13) 7 commits
 . SQUASH???
 . cat-file: add remote-object-info to batch-command
 . transport: add client support for object-info
 . serve: advertise object-info feature
 . protocol-caps: initialization bug fix
 . fetch-pack: move fetch initialization
 . fetch-pack: refactor packet writing

 A client component to talk with the object-info endpoint.

 Tired of waiting for too long.
 Under SANITIZE=address, t1006-cat-file.sh finds a breakage.
 cf. <20220728230210.2952731-1-calvinwan@google.com>
 cf. <CAFySSZDvgwbbHCHfyuaqX3tKsr-GjJ9iihygg6rNNe46Ys7_EA@mail.gmail.com>
 source: <20220728230210.2952731-1-calvinwan@google.com>


* tl/ls-tree--pattern (2022-11-17) 6 commits
 . ls-tree: introduce '--pattern' option
 . ls-tree: introduce 'match_pattern()' function
 . ls-tree: improving cohension in the print code
 . ls-tree: optimize params of 'show_tree_common_default_long()'
 . t3104: remove shift code in 'test_ls_tree_format'
 . ls-tree: cleanup the redundant SPACE

 A synonym for "ls-tree | grep <pattern>", "ls-tree
 --pattern=<pattern>" was introduced.

 No upsides.
 cf. <xmqqbko6y2q5.fsf@gitster.g>
 source: <20221117113023.65865-1-tenglong.tl@alibaba-inc.com>


* ds/packed-refs-v2 (2022-11-07) 30 commits
 . refs: skip hashing when writing packed-refs v2
 . p1401: create performance test for ref operations
 . ci: run GIT_TEST_PACKED_REFS_VERSION=2 in some builds
 . t*: skip packed-refs v2 over http tests
 . t3210: require packed-refs v1 for some tests
 . t5502: add PACKED_REFS_V1 prerequisite
 . t5312: allow packed-refs v2 format
 . t1409: test with packed-refs v2
 . packed-backend: create GIT_TEST_PACKED_REFS_VERSION
 . packed-refs: write prefix chunks
 . packed-refs: read optional prefix chunks
 . packed-refs: read file format v2
 . packed-refs: write file format version 2
 . packed-backend: create shell of v2 writes
 . config: add config values for packed-refs v2
 . packed-backend: create abstraction for writing refs
 . packed-backend: extract iterator/updates merge
 . packed-backend: extract add_write_error()
 . refs: extract packfile format to new file
 . chunk-format: parse trailing table of contents
 . chunk-format: allow trailing table of contents
 . chunk-format: store chunk offset during write
 . chunk-format: document trailing table of contents
 . chunk-format: number of chunks is optional
 . refs: allow loose files without packed-refs
 . repository: wire ref extensions to ref backends
 . config: fix multi-level bulleted list
 . extensions: add refFormat extension
 . read-cache: add index.computeHash config option
 . hashfile: allow skipping the hash function

 Retracted.


* ab/make-bin-wrappers (2022-10-31) 4 commits
 . Makefile: simplify $(test_bindir_programs) rule by splitting it up
 . Makefile: rename "test_bindir_programs" variable, pre-declare
 . Makefile: define "TEST_{PROGRAM,OBJS}" variables earlier
 . Makefile: factor sed-powered '#!/bin/sh' munging into a variable

 Resolve issues with the bin-wrappers/% rules where "make
 bin-wrappers/git" would generate the script but not "git" itself.
 ((that is not an issue but doing the right thing))

 Bad idea.
 source: <cover-v3-0.4-00000000000-20221031T222249Z-avarab@gmail.com>

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

> In the past, I tried to re-examine all the topics in 'next' myself
> to pick and choose the ones to be kept before rewinding and
> rebuilding 'next' after each release, which took me a while.  This
> time, to share the burden to expedite the process, I'll reset 'next'
> to 'master' without any topics merged, and rely on input from list
> participants.
>
> The topics that used to be in 'next' are all marked as "Will merge
> back to 'next'", but people can tell me to give them a chance to
> reboot their topics, instead of piling "oops, that was wrong" fixes
> on top, while I wait for such an input for the coming days.

What is involved in "re-examine to pick and choose the ones to be
kept" was to go to the original thread (which should not be too
hard, as Taylor has maintained the "source:" line in the report well
during my absense) see general consensus and the reason behind the
consensus back then still applies today.  So another way people can
help the process is to say something like "After re-reading the
https://lore.kernel.org/git/$THIS thread, and particularly reading
$THAT message from $TRUSTWORTHY_REVIEWER, what the $TOPIC wants to
do and how it does it are both sensible."

No self promotion, though ;-)

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Derrick Stolee]

On 12/14/2022 4:59 AM, Junio C Hamano wrote:

> * ds/omit-trailing-hash-in-index (2022-12-13) 4 commits
>  - features: feature.manyFiles implies fast index writes
>  - test-lib-functions: add helper for trailing hash
>  - read-cache: add index.skipHash config option
>  - hashfile: allow skipping the hash function
> 
>  Introduce an optional configuration to allow the trailing hash that
>  protects the index file from bit flipping.
> 
>  Will merge to 'next'.
>  source: <pull.1439.v2.git.1670862677.gitgitgadget@gmail.com>

There are some outstanding comments on expanding the documentation
and commit messages, so I'm intending to send a v3 later this week.
Please hold off from merging to 'next' until then.

Thanks,
-Stolee

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Jeff Hostetler]

On 12/14/22 4:59 AM, Junio C Hamano wrote:
> * jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
>   - fsmonitor: eliminate call to deprecated FSEventStream function
> 
>   Stop using deprecated macOS API in fsmonitor.
> 
>   Will merge back to 'next'.
>   source:<pull.1436.git.1669991072393.gitgitgadget@gmail.com>


Stefan Sundin noticed a typo in my commit message:
 >Typo here, MacOS 13 is Ventura not Ventana.

I'll send a V2 shortly (and it will include your paragraph
about Apple and deprecated APIs).

Thanks,
Jeff

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Jeff Hostetler]

On 12/14/22 4:59 AM, Junio C Hamano wrote:
> * jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
>   - fsmonitor: fix race seen in t7527
> 
>   Make fsmonitor more robust to avoid the flakiness seen in t7527.
> 
>   Will merge back to 'next'.
>   source:<pull.1437.git.1669937534944.gitgitgadget@gmail.com>
> 

There was no discussion on this item and nothing needs to be
revisited, so it could go as is.

Thanks,
Jeff

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Taylor Blau]

On Wed, Dec 14, 2022 at 07:44:23PM +0900, Junio C Hamano wrote:
> Junio C Hamano <gitster@pobox.com> writes:
>
> > In the past, I tried to re-examine all the topics in 'next' myself
> > to pick and choose the ones to be kept before rewinding and
> > rebuilding 'next' after each release, which took me a while.  This
> > time, to share the burden to expedite the process, I'll reset 'next'
> > to 'master' without any topics merged, and rely on input from list
> > participants.
> >
> > The topics that used to be in 'next' are all marked as "Will merge
> > back to 'next'", but people can tell me to give them a chance to
> > reboot their topics, instead of piling "oops, that was wrong" fixes
> > on top, while I wait for such an input for the coming days.
>
> What is involved in "re-examine to pick and choose the ones to be
> kept" was to go to the original thread (which should not be too
> hard, as Taylor has maintained the "source:" line in the report well
> during my absense) see general consensus and the reason behind the
> consensus back then still applies today.

Since it wasn't obvious to me, I figure it is worth mentioning that the
effort to maintain these source lines can be done via the "amlog" notes,
which are automatically filled in when applying new patches from the
list via your post-applypatch hook.

The relevant parts being:

  message_id="$(...)"
  if test -n "$message_id" && head=$(git rev-parse --verify HEAD 2>/dev/null)
  then
    echo "$head $message_id" >>"$GIT_DIR"/am.log &&
    (
      GIT_NOTES_REF=refs/notes/amlog
      export GIT_NOTES_REF
      git notes add -f -m "Message-Id: $message_id" "$head"
    )
  fi

I just made sure to push `refs/notes/amlog` up when doing new push-outs.
The rest (including the "source:" lines in the WC reports) was made easy
by your Meta/cook script.

Thanks,
Taylor

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Derrick Stolee <derrickstolee@github.com> writes:

> On 12/14/2022 4:59 AM, Junio C Hamano wrote:
>
>> * ds/omit-trailing-hash-in-index (2022-12-13) 4 commits
>>  - features: feature.manyFiles implies fast index writes
>>  - test-lib-functions: add helper for trailing hash
>>  - read-cache: add index.skipHash config option
>>  - hashfile: allow skipping the hash function
>> 
>>  Introduce an optional configuration to allow the trailing hash that
>>  protects the index file from bit flipping.
>> 
>>  Will merge to 'next'.
>>  source: <pull.1439.v2.git.1670862677.gitgitgadget@gmail.com>
>
> There are some outstanding comments on expanding the documentation
> and commit messages, so I'm intending to send a v3 later this week.
> Please hold off from merging to 'next' until then.

Thanks, will comply.

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Jeff Hostetler <git@jeffhostetler.com> writes:

> On 12/14/22 4:59 AM, Junio C Hamano wrote:
>> * jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
>>   - fsmonitor: eliminate call to deprecated FSEventStream function
>>   Stop using deprecated macOS API in fsmonitor.
>>   Will merge back to 'next'.
>>   source:<pull.1436.git.1669991072393.gitgitgadget@gmail.com>
>
>
> Stefan Sundin noticed a typo in my commit message:
>>Typo here, MacOS 13 is Ventura not Ventana.
>
> I'll send a V2 shortly (and it will include your paragraph
> about Apple and deprecated APIs).

Thanks, will hold.

ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Ævar Arnfjörð Bjarmason]

On Wed, Dec 14 2022, Junio C Hamano wrote:

> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>  . sequencer: use the "octopus" strategy without forking
>  . sequencer: use the "resolve" strategy without forking
>  . merge: use the "octopus" strategy without forking
>  . merge: use the "resolve" strategy without forking
>  . merge-octopus: rewrite in C
>  . merge-recursive: move better_branch_name() to merge.c
>  . merge-resolve: rewrite in C
>  . merge-one-file: rewrite in C
>  . update-index: move add_cacheinfo() to read-cache.c
>  . merge-index: add a new way to invoke `git-merge-one-file'
>  . merge-index: drop the index
>  . merge-index: libify merge_one_path() and merge_all()
>  . t6060: add tests for removed files
>  . t6060: modify multiple files to expose a possible issue with merge-index
>
>  An attempt to rewrite remaining merge strategies from shell to C.
>
>  Tired of waiting for too long.
>  source: <20220809185429.20098-1-alban.gruin@gmail.com>

I submitted a v9 of this during Taylor's maintainership, but it fell
between the cracks. I've submitted a rebased-on-master v10 now (there
were some conflicts):
https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/

It's just the "prep" patches, the real meaty part is converting the
merge drivers, which will come after. Some of the performance numbers
for those are really impressive...

ab/remove--super-prefix & ab/submodule-no-abspath (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Ævar Arnfjörð Bjarmason]

On Wed, Dec 14 2022, Junio C Hamano wrote:

> * ab/remove--super-prefix (2022-11-21) 12 commits
>  . fetch: rename "--submodule-prefix" to "--super-prefix"
>  . read-tree: add "--super-prefix" option, eliminate global
>  . submodule--helper: convert "{update,clone}" to their own "--super-prefix"
>  . submodule--helper: convert "status" to its own "--super-prefix"
>  . submodule--helper: convert "sync" to its own "--super-prefix"
>  . submodule--helper: convert "foreach" to its own "--super-prefix"
>  . submodule--helper: don't use global --super-prefix in "absorbgitdirs"
>  . submodule.c & submodule--helper: pass along "super_prefix" param
>  . read-tree + fetch tests: test failing "--super-prefix" interaction
>  . Merge branch 'ab/submodule-no-abspath' into ab/remove--super-prefix
>  . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
>  . Merge branch 'ab/submodule-helper-prep-only' into ab/remove--super-prefix
>
>  Remove the top-level `--super-prefix` option.
>  Will discard.
>  cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>
>  source: <cover-v3-0.9-00000000000-20221119T122853Z-avarab@gmail.com>
>
>
> * ab/submodule-no-abspath (2022-11-23) 2 commits
>  . submodule absorbgitdirs: use relative <from> and <to> paths
>  . submodule--helper absorbgitdirs: no abspaths in "Migrating git..."
>
>  Remove an absolute path in the "Migrating git directory" message.
>
>  Revert out of 'next'.
>  cf. the thread leading to <xmqqmt86stm3.fsf@gitster.g>
>  source: <patch-1.1-34b54fdd9bb-20221109T020347Z-avarab@gmail.com>

This stranded on the question of whether the "absorbgitdirs" message
should show relative paths or not.

I've re-rolled this post-release just now at
https://lore.kernel.org/git/cover-v4-0.9-00000000000-20221215T083502Z-avarab@gmail.com/;
this time around there's no changes to the output.

js/bisect-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Ævar Arnfjörð Bjarmason]

On Wed, Dec 14 2022, Junio C Hamano wrote:

> * js/bisect-in-c (2022-08-30) 17 commits
>  . bisect: no longer try to clean up left-over `.git/head-name` files
>  . bisect: remove Cogito-related code
>  . Turn `git bisect` into a full built-in
>  . bisect: move even the command-line parsing to `bisect--helper`
>  . bisect--helper: make `state` optional
>  . bisect--helper: calling `bisect_state()` without an argument is a bug
>  . bisect: avoid double-quoting when printing the failed command
>  . bisect run: fix the error message
>  . bisect: verify that a bogus option won't try to start a bisection
>  . bisect--helper: migrate to OPT_SUBCOMMAND()
>  . bisect--helper: make the order consistently `argc, argv`
>  . bisect--helper: make `terms` an explicit singleton
>  . bisect--helper: simplify exit code computation
>  . bisect--helper: really retire `--bisect-autostart`
>  . bisect--helper: really retire --bisect-next-check
>  . bisect--helper: retire the --no-log option
>  . Merge branch 'sg/parse-options-subcommand' into js/bisect-in-c
>
>  Final bits of "git bisect.sh" have been rewritten in C.
>
>  Tired of waiting for too long.
>  source: <pull.1132.v6.git.1661885419.gitgitgadget@gmail.com>

I submitted
https://lore.kernel.org/git/cover-0.6-00000000000-20221215T094038Z-avarab@gmail.com/
just now, which cherry-picks the various small fixes from this topic.

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Sean Allred]

> * sa/git-var-empty (2022-11-27) 2 commits
>   (merged to 'next' on 2022-12-01 at 3b81dcb382)
>  + var: allow GIT_EDITOR to return null
>  + var: do not print usage() with a correct invocation
>
>  "git var UNKNOWN_VARIABLE" and "git var VARIABLE" with the variable
>  given an empty value used to behave identically.  Now the latter
>  just gives an empty output, while the former still gives an error
>  message.
>  source: <pull.1434.v3.git.1669472277.gitgitgadget@gmail.com>

After reading gitworkflows.txt and maintaingit.txt, I take it 'next' is
a proving ground for the larger community to have a chance to suss out
any bugs/regressions. I'm going to assume no further input is needed
from me regarding this topic (unless of course I've got a bug!), but let
me know if I'm mistaken :-) (and thanks to all the folks who've already
provided review!)

Is now a good time to resume the conversation of exposing
GIT_SEQUENCE_EDITOR variable within git-var [1]? I expect the patch to
be mostly the same, but instead following the now-corrected pattern laid
out for GIT_EDITOR (and updated to use the new test helper functions).
Should I then base my branch on 'next' or upon 'sa/git-var-empty'
specifically (now merged to 'next')?

[1]: https://lore.kernel.org/git/pull.1424.git.1668972017089.gitgitgadget@gmail.com/T/#u

--
Sean Allred

Re: ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Phillip Wood]

On 15/12/2022 09:14, Ævar Arnfjörð Bjarmason wrote:
> 
> On Wed, Dec 14 2022, Junio C Hamano wrote:
> 
>> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>>   . sequencer: use the "octopus" strategy without forking
>>   . sequencer: use the "resolve" strategy without forking
>>   . merge: use the "octopus" strategy without forking
>>   . merge: use the "resolve" strategy without forking
>>   . merge-octopus: rewrite in C
>>   . merge-recursive: move better_branch_name() to merge.c
>>   . merge-resolve: rewrite in C
>>   . merge-one-file: rewrite in C
>>   . update-index: move add_cacheinfo() to read-cache.c
>>   . merge-index: add a new way to invoke `git-merge-one-file'
>>   . merge-index: drop the index
>>   . merge-index: libify merge_one_path() and merge_all()
>>   . t6060: add tests for removed files
>>   . t6060: modify multiple files to expose a possible issue with merge-index
>>
>>   An attempt to rewrite remaining merge strategies from shell to C.
>>
>>   Tired of waiting for too long.
>>   source: <20220809185429.20098-1-alban.gruin@gmail.com>
> 
> I submitted a v9 of this during Taylor's maintainership, but it fell
> between the cracks. I've submitted a rebased-on-master v10 now (there
> were some conflicts):
> https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/
> 
> It's just the "prep" patches, the real meaty part is converting the
> merge drivers, which will come after. Some of the performance numbers
> for those are really impressive...

I think splitting this in two is a good idea as there were only a couple 
of outstanding issues with the first half of Alban's V8. When you posted 
V9 I looked at the range-diff hoping to see a couple of localized 
changes addressing those issues. Instead it looks like you've rewritten 
most of the patches that people have already spent a considerable time 
reviewing. I don't think it is a good use of reviewers' time to 
essentially start reviewing again from scratch.

Best Wishes

Phillip

Re: ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Ævar Arnfjörð Bjarmason]

On Thu, Dec 15 2022, Phillip Wood wrote:

> On 15/12/2022 09:14, Ævar Arnfjörð Bjarmason wrote:
>> On Wed, Dec 14 2022, Junio C Hamano wrote:
>> 
>>> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>>>   . sequencer: use the "octopus" strategy without forking
>>>   . sequencer: use the "resolve" strategy without forking
>>>   . merge: use the "octopus" strategy without forking
>>>   . merge: use the "resolve" strategy without forking
>>>   . merge-octopus: rewrite in C
>>>   . merge-recursive: move better_branch_name() to merge.c
>>>   . merge-resolve: rewrite in C
>>>   . merge-one-file: rewrite in C
>>>   . update-index: move add_cacheinfo() to read-cache.c
>>>   . merge-index: add a new way to invoke `git-merge-one-file'
>>>   . merge-index: drop the index
>>>   . merge-index: libify merge_one_path() and merge_all()
>>>   . t6060: add tests for removed files
>>>   . t6060: modify multiple files to expose a possible issue with merge-index
>>>
>>>   An attempt to rewrite remaining merge strategies from shell to C.
>>>
>>>   Tired of waiting for too long.
>>>   source: <20220809185429.20098-1-alban.gruin@gmail.com>
>> I submitted a v9 of this during Taylor's maintainership, but it fell
>> between the cracks. I've submitted a rebased-on-master v10 now (there
>> were some conflicts):
>> https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/
>> It's just the "prep" patches, the real meaty part is converting the
>> merge drivers, which will come after. Some of the performance numbers
>> for those are really impressive...
>
> I think splitting this in two is a good idea as there were only a
> couple of outstanding issues with the first half of Alban's V8. When
> you posted V9 I looked at the range-diff hoping to see a couple of
> localized changes addressing those issues. Instead it looks like
> you've rewritten most of the patches that people have already spent a
> considerable time reviewing. I don't think it is a good use of
> reviewers' time to essentially start reviewing again from scratch.

What do you consider a good way to turn this comment into something
actionable?

To have a minimal re-submission of the v8 which simply fixes the
semnatic & textual merge conflicts we've had on "master" in the interim?

I think such a re-submission would need to address the issues I noted in
the v9 CL[1]. E.g. that in over-libifying merge-index its behavior was
changed, e.g. emitting N error() instead of die()-ing on the 1st
one. Addressing that is going to need to require around the same code
changes.

This is also a case where the range-diff looks overly scary, aside from
such specific fixes the end result is substantially the same, but I did
split up (and mostly not rewrite) the existing patches to:

* Cleanly separate those bits that were changing behavior, from those
  that were not (and precede them with tests to assert that)

* Make the eventual libification change as small as possible, now it
  really benefits from the diff rename detection.

If you have some more specific suggestions for how to move forward I'm
all ears.

1. https://lore.kernel.org/git/cover-v9-00.12-00000000000-20221118T110058Z-avarab@gmail.com/

Re: ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Phillip Wood]

Hi Ævar

On 15/12/2022 15:32, Ævar Arnfjörð Bjarmason wrote:
> 
> On Thu, Dec 15 2022, Phillip Wood wrote:
> 
>> On 15/12/2022 09:14, Ævar Arnfjörð Bjarmason wrote:
>>> On Wed, Dec 14 2022, Junio C Hamano wrote:
>>>
>>>> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>>>>    . sequencer: use the "octopus" strategy without forking
>>>>    . sequencer: use the "resolve" strategy without forking
>>>>    . merge: use the "octopus" strategy without forking
>>>>    . merge: use the "resolve" strategy without forking
>>>>    . merge-octopus: rewrite in C
>>>>    . merge-recursive: move better_branch_name() to merge.c
>>>>    . merge-resolve: rewrite in C
>>>>    . merge-one-file: rewrite in C
>>>>    . update-index: move add_cacheinfo() to read-cache.c
>>>>    . merge-index: add a new way to invoke `git-merge-one-file'
>>>>    . merge-index: drop the index
>>>>    . merge-index: libify merge_one_path() and merge_all()
>>>>    . t6060: add tests for removed files
>>>>    . t6060: modify multiple files to expose a possible issue with merge-index
>>>>
>>>>    An attempt to rewrite remaining merge strategies from shell to C.
>>>>
>>>>    Tired of waiting for too long.
>>>>    source: <20220809185429.20098-1-alban.gruin@gmail.com>
>>> I submitted a v9 of this during Taylor's maintainership, but it fell
>>> between the cracks. I've submitted a rebased-on-master v10 now (there
>>> were some conflicts):
>>> https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/
>>> It's just the "prep" patches, the real meaty part is converting the
>>> merge drivers, which will come after. Some of the performance numbers
>>> for those are really impressive...
>>
>> I think splitting this in two is a good idea as there were only a
>> couple of outstanding issues with the first half of Alban's V8. When
>> you posted V9 I looked at the range-diff hoping to see a couple of
>> localized changes addressing those issues. Instead it looks like
>> you've rewritten most of the patches that people have already spent a
>> considerable time reviewing. I don't think it is a good use of
>> reviewers' time to essentially start reviewing again from scratch.
> 
> What do you consider a good way to turn this comment into something
> actionable?

To address the issues noted in [1-3] by tweaking patches 3, 5 & 7 of v8 
and not rewrite all the other patches. Note that the sequencer cannot 
die() while merging so we need to be careful when fixing patch 3 - it 
should bail out early rather than dying when there is an error.

Best Wishes

Phillip

[1] https://lore.kernel.org/git/220817.86lernaa9i.gmgdl@evledraar.gmail.com
[2] https://lore.kernel.org/git/o759r3qn-nqn9-oq22-p90o-2nrn24085n80@tzk.qr
[3] https://lore.kernel.org/git/2r992r19-or36-733r-1139-4575n9o6o23s@tzk.qr

> To have a minimal re-submission of the v8 which simply fixes the
> semnatic & textual merge conflicts we've had on "master" in the interim?
> 
> I think such a re-submission would need to address the issues I noted in
> the v9 CL[1]. E.g. that in over-libifying merge-index its behavior was
> changed, e.g. emitting N error() instead of die()-ing on the 1st
> one. Addressing that is going to need to require around the same code
> changes.
> 
> This is also a case where the range-diff looks overly scary, aside from
> such specific fixes the end result is substantially the same, but I did
> split up (and mostly not rewrite) the existing patches to:
> 
> * Cleanly separate those bits that were changing behavior, from those
>    that were not (and precede them with tests to assert that)
> 
> * Make the eventual libification change as small as possible, now it
>    really benefits from the diff rename detection.
> 
> If you have some more specific suggestions for how to move forward I'm
> all ears.
> 
> 1. https://lore.kernel.org/git/cover-v9-00.12-00000000000-20221118T110058Z-avarab@gmail.com/

Re: ag/merge-strategies-in-c (was: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Ævar Arnfjörð Bjarmason]

On Thu, Dec 15 2022, Phillip Wood wrote:

> Hi Ævar
>
> On 15/12/2022 15:32, Ævar Arnfjörð Bjarmason wrote:
>> On Thu, Dec 15 2022, Phillip Wood wrote:
>> 
>>> On 15/12/2022 09:14, Ævar Arnfjörð Bjarmason wrote:
>>>> On Wed, Dec 14 2022, Junio C Hamano wrote:
>>>>
>>>>> * ag/merge-strategies-in-c (2022-08-10) 14 commits
>>>>>    . sequencer: use the "octopus" strategy without forking
>>>>>    . sequencer: use the "resolve" strategy without forking
>>>>>    . merge: use the "octopus" strategy without forking
>>>>>    . merge: use the "resolve" strategy without forking
>>>>>    . merge-octopus: rewrite in C
>>>>>    . merge-recursive: move better_branch_name() to merge.c
>>>>>    . merge-resolve: rewrite in C
>>>>>    . merge-one-file: rewrite in C
>>>>>    . update-index: move add_cacheinfo() to read-cache.c
>>>>>    . merge-index: add a new way to invoke `git-merge-one-file'
>>>>>    . merge-index: drop the index
>>>>>    . merge-index: libify merge_one_path() and merge_all()
>>>>>    . t6060: add tests for removed files
>>>>>    . t6060: modify multiple files to expose a possible issue with merge-index
>>>>>
>>>>>    An attempt to rewrite remaining merge strategies from shell to C.
>>>>>
>>>>>    Tired of waiting for too long.
>>>>>    source: <20220809185429.20098-1-alban.gruin@gmail.com>
>>>> I submitted a v9 of this during Taylor's maintainership, but it fell
>>>> between the cracks. I've submitted a rebased-on-master v10 now (there
>>>> were some conflicts):
>>>> https://lore.kernel.org/git/cover-v10-00.12-00000000000-20221215T084803Z-avarab@gmail.com/
>>>> It's just the "prep" patches, the real meaty part is converting the
>>>> merge drivers, which will come after. Some of the performance numbers
>>>> for those are really impressive...
>>>
>>> I think splitting this in two is a good idea as there were only a
>>> couple of outstanding issues with the first half of Alban's V8. When
>>> you posted V9 I looked at the range-diff hoping to see a couple of
>>> localized changes addressing those issues. Instead it looks like
>>> you've rewritten most of the patches that people have already spent a
>>> considerable time reviewing. I don't think it is a good use of
>>> reviewers' time to essentially start reviewing again from scratch.
>> What do you consider a good way to turn this comment into something
>> actionable?
>
> To address the issues noted in [1-3] by tweaking patches 3, 5 & 7 of
> v8 and not rewrite all the other patches. 
>
> Best Wishes
>
> Phillip
>
> [1] https://lore.kernel.org/git/220817.86lernaa9i.gmgdl@evledraar.gmail.com
> [2] https://lore.kernel.org/git/o759r3qn-nqn9-oq22-p90o-2nrn24085n80@tzk.qr
> [3] https://lore.kernel.org/git/2r992r19-or36-733r-1139-4575n9o6o23s@tzk.qr

That seems to implicitly assume that the outstanding feedback on the v8
was the last word on outstanding issues with the series.

The v9..v10 combines addressing those, with issues that I discovered
along the way. I had not reviewed this series in any detail before.

So, I could submit such a v8.5, and then comment on it, and address
those comments, and then we'd be back to the same v9 in the end?

Since I didn't see the point of doing that I submitted the v9 directly.

> Note that the sequencer cannot die() while merging so we need to be
> careful when fixing patch 3 - it should bail out early rather than
> dying when there is an error.

Yes, part 2 will address that, i.e. there are callers that need to not
die() in the same process, but the v8 took the approach of changing the
entirety of the API to error(), but as it turns out the surface where we
needed to error() or die() is much smaller than that in the end.

>> To have a minimal re-submission of the v8 which simply fixes the
>> semnatic & textual merge conflicts we've had on "master" in the interim?
>> I think such a re-submission would need to address the issues I
>> noted in
>> the v9 CL[1]. E.g. that in over-libifying merge-index its behavior was
>> changed, e.g. emitting N error() instead of die()-ing on the 1st
>> one. Addressing that is going to need to require around the same code
>> changes.
>> This is also a case where the range-diff looks overly scary, aside
>> from
>> such specific fixes the end result is substantially the same, but I did
>> split up (and mostly not rewrite) the existing patches to:
>> * Cleanly separate those bits that were changing behavior, from
>> those
>>    that were not (and precede them with tests to assert that)
>> * Make the eventual libification change as small as possible, now it
>>    really benefits from the diff rename detection.
>> If you have some more specific suggestions for how to move forward
>> I'm
>> all ears.
>> 1. https://lore.kernel.org/git/cover-v9-00.12-00000000000-20221118T110058Z-avarab@gmail.com/

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Jeff Hostetler <git@jeffhostetler.com> writes:

> On 12/14/22 4:59 AM, Junio C Hamano wrote:
>> * jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
>>   - fsmonitor: fix race seen in t7527
>>   Make fsmonitor more robust to avoid the flakiness seen in t7527.
>>   Will merge back to 'next'.
>>   source:<pull.1437.git.1669937534944.gitgitgadget@gmail.com>
>> 
>
> There was no discussion on this item and nothing needs to be
> revisited, so it could go as is.

No discussion is not a good news, though.

Always using cookie files means we no longer sometimes use them and
sometimes not---which means fewer variations to think about and in
general is a good thing.

As you explain in the last paragraph of the proposed log message, if
the test caught a bug introduced by a premature optimization that
was not-well-thought-out, the test served its purpose very well.
Good.

Let's mark it as "Will merge to 'next'" again.

Thanks.

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

Let's mark the following to "Will merge to 'next'" again.

> * rs/t3920-crlf-eating-grep-fix (2022-12-07) 1 commit
>  - t3920: support CR-eating grep
>  (this branch uses js/t3920-shell-and-or-fix.)
>
>  Test fix.
>
>  Will merge back to 'next'.
>  source: <cbe88abc-c1fb-cb50-6057-47ff27f7a12d@web.de>

With reviews by Philippe and Eric, this one still looks reasonable.

> * ab/t4023-avoid-losing-exit-status-of-diff (2022-12-05) 1 commit
>  - t4023: fix ignored exit codes of git
>
>  Test fix.
>
>  Will merge back to 'next'.
>  source: <patch-v2-3.8-c5feef1c808-20221202T000227Z-avarab@gmail.com>

Simple, obvious and trivially correct.

> * jh/t7527-unflake-by-forcing-cookie (2022-12-02) 1 commit
>  - fsmonitor: fix race seen in t7527
>
>  Make fsmonitor more robust to avoid the flakiness seen in t7527.
>
>  Will merge back to 'next'.
>  source: <pull.1437.git.1669937534944.gitgitgadget@gmail.com>

<xmqqfsdgqonk.fsf@gitster.g>.

> * rs/plug-pattern-list-leak-in-lof (2022-12-02) 1 commit
>  - list-objects-filter: plug pattern_list leak
>
>  Leak fix.
>
>  Will merge back to 'next'.
>  source: <b4361c3e-852b-e30c-f240-86c34bc9c474@web.de>

Simple, obvious and trivially correct.

> * rs/t4205-do-not-exit-in-test-script (2022-12-02) 1 commit
>  - t4205: don't exit test script on failure
>
>  Test fix.
>
>  Will merge back to 'next'.
>  source: <c5b4d091-23c1-5a75-a255-99ec83973d8d@web.de>

Ditto.

> * ab/t5314-avoid-losing-exit-status (2022-12-02) 1 commit
>  - t5314: check exit code of "git"
>
>  Test fix.
>
>  Will merge back to 'next'.
>  source: <patch-v2-1.1-ca77a7249e6-20221128T141818Z-avarab@gmail.com>

Ditto.

> * ab/t7600-avoid-losing-exit-status-of-git (2022-12-05) 1 commit
>  - t7600: don't ignore "rev-parse" exit code in helper
>
>  Test fix.
>
>  Will merge back to 'next'.
>  source: <patch-v3-1.8-64dfec31fb3-20221202T114733Z-avarab@gmail.com>

Ditto.

> * jh/fsmonitor-darwin-modernize (2022-12-05) 1 commit
>  - fsmonitor: eliminate call to deprecated FSEventStream function
>
>  Stop using deprecated macOS API in fsmonitor.
>
>  Will merge back to 'next'.
>  source: <pull.1436.git.1669991072393.gitgitgadget@gmail.com>

This one was updated <pull.1436.v2.git.1671045153981.gitgitgadget@gmail.com>

Re: What's cooking in git.git (Dec 2022, #05; Wed, 14)

[Junio C Hamano]

Junio C Hamano <gitster@pobox.com> writes:

Continuing from the previous one.

> * js/t3920-shell-and-or-fix (2022-12-05) 1 commit
> * sx/pthread-error-check-fix (2022-12-05) 1 commit
> * jk/avoid-redef-system-functions (2022-12-05) 3 commits
> * jk/avoid-redef-system-functions-2.30 (2022-12-05) 2 commits
> * aw/complete-case-insensitive (2022-11-30) 2 commits

These are all simple, obvious and trivially correct.

> * rs/diff-parseopts (2022-12-02) 3 commits

Not exactly trivial but very well explained and easy to follow.

ds/bundle-uri-4* (was Re: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Derrick Stolee]

On 12/14/2022 4:59 AM, Junio C Hamano wrote:

> * ds/bundle-uri-4-fixup (2022-12-13) 3 commits
>  - bundle-uri: remove GIT_TEST_BUNDLE_URI env variable
>  - bundle-uri: advertise based on repo config
>  - bundle-uri: drop unused 'uri' parameter
>  (this branch uses ds/bundle-uri-4.)
> 
>  Incremental fixes on ds/bundle-uri-4 topic.
> 
>  Will merge to 'next'?
>  source: <pull.1443.git.1670866407.gitgitgadget@gmail.com>

> * ds/bundle-uri-4 (2022-12-06) 11 commits
>  - clone: unbundle the advertised bundles
>  - bundle-uri: download bundles from an advertised list
>  - bundle-uri: allow relative URLs in bundle lists
>  - strbuf: introduce strbuf_strip_file_from_path()
>  - bundle-uri: serve bundle.* keys from config
>  - bundle-uri client: add helper for testing server
>  - transport: rename got_remote_heads
>  - bundle-uri client: add boolean transfer.bundleURI setting
>  - clone: request the 'bundle-uri' command when available
>  - t: create test harness for 'bundle-uri' command
>  - protocol v2: add server-side "bundle-uri" skeleton
>  (this branch is used by ds/bundle-uri-4-fixup.)
> 
>  Bundle URIs part 4.
> 
>  Will merge back to 'next'?
>  source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>

Please do merge these to 'next'. Things have been stable
since ds/bundle-uri-4-fixup was submitted and I'm currently
polishing part 5 on top of that branch.

Thanks,
-Stolee

Re: ds/bundle-uri-4* (was Re: What's cooking in git.git (Dec 2022, #05; Wed, 14))

[Junio C Hamano]

Derrick Stolee <derrickstolee@github.com> writes:

> On 12/14/2022 4:59 AM, Junio C Hamano wrote:
>
>> * ds/bundle-uri-4-fixup (2022-12-13) 3 commits
>>  ...
>>  Will merge to 'next'?
>>  source: <pull.1443.git.1670866407.gitgitgadget@gmail.com>
>
>> * ds/bundle-uri-4 (2022-12-06) 11 commits
>>  ...
>>  Will merge back to 'next'?
>>  source: <pull.1400.v3.git.1670262639.gitgitgadget@gmail.com>
>
> Please do merge these to 'next'.

Heh, these question marks were meant to invite "wow, now we have
both of these outside 'next', we can fold the 'oops that was wrong'
fix-up patches and redo the base series; thanks for the opportunity
to clean up the history" ;-).

> Things have been stable since ds/bundle-uri-4-fixup was submitted
> and I'm currently polishing part 5 on top of that branch.

OK.

Thanks.