{"thread":{"id":"57068","subject":"What's cooking in git.git (Dec 2021, #03; Fri, 10)","startedAt":"2021-12-11T02:52:54Z","lastAt":"2021-12-15T18:54:36Z","messageCount":21,"participants":["Junio C Hamano","Neeraj Singh","Elijah Newren","Eric Sunshine","Taylor Blau","Ævar Arnfjörð Bjarmason","Jeff Hostetler","Teng Long","Phillip Wood"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"443861","messageId":"xmqqilvvluoa.fsf@gitster.g","threadId":"57068","inReplyTo":null,"subject":"What's cooking in git.git (Dec 2021, #03; Fri, 10)","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-12-11T02:52:37Z","receivedAt":"2021-12-11T02:52:54Z","isPatch":false,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Here are the topics that have been cooking in my tree. Commits\nprefixed with '+' are in 'next' (being in 'next' is a sign that a\ntopic is stable enough to be used and are candidate to be in a\nfuture release). Commits prefixed with '-' are only in 'seen',\nwhich means nothing more than that I have found them of interest for\nsome reason (like \"it may have hard-to-resolve conflicts with\nanother topic already in flight\" or \"this may turn out to be\nuseful\"). Do not read too much into a topic being in (or not in)\n'seen'. The ones marked with '.' do not appear in any of the\nintegration branches, but I am still holding onto them.\n\nQuite a few topics are now in 'master' as part of the second batch.\n\nCopies of the source code to Git live in many repositories, and the\nfollowing is a list of the ones I push into or their mirrors. Some\nrepositories have only a subset of branches.\n\nWith maint, master, next, seen, todo:\n\n\tgit://git.kernel.org/pub/scm/git/git.git/\n\tgit://repo.or.cz/alt-git.git/\n\thttps://kernel.googlesource.com/pub/scm/git/git/\n\thttps://github.com/git/git/\n\thttps://gitlab.com/git-vcs/git/\n\nWith all the integration branches and topics broken out:\n\n\thttps://github.com/gitster/git/\n\nEven though the preformatted documentation in HTML and man format\nare not sources, they are published in these repositories for\nconvenience (replace \"htmldocs\" with \"manpages\" for the manual\npages):\n\n\tgit://git.kernel.org/pub/scm/git/git-htmldocs.git/\n\thttps://github.com/gitster/git-htmldocs.git/\n\nRelease tarballs are available at:\n\n\thttps://www.kernel.org/pub/software/scm/git/\n\n--------------------------------------------------\n[Graduated to 'master']\n\n* ab/checkout-branch-info-leakfix (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 5922388782)\n + checkout: fix \"branch info\" memory leaks\n\n Leakfix.\n source: \n\n\n* ab/generate-command-list (2021-11-05) 10 commits\n (merged to 'next' on 2021-12-02 at 37a575b37f)\n + generate-cmdlist.sh: don't parse command-list.txt thrice\n + generate-cmdlist.sh: replace \"grep' invocation with a shell version\n + generate-cmdlist.sh: do not shell out to \"sed\"\n + generate-cmdlist.sh: stop sorting category lines\n + generate-cmdlist.sh: replace for loop by printf's auto-repeat feature\n + generate-cmdlist.sh: run \"grep | sort\", not \"sort | grep\"\n + generate-cmdlist.sh: don't call get_categories() from category_list()\n + generate-cmdlist.sh: spawn fewer processes\n + generate-cmdlist.sh: trivial whitespace change\n + command-list.txt: sort with \"LC_ALL=C sort\"\n\n Build optimization.\n source: \n\n\n* ah/advice-pull-has-no-preference-between-rebase-and-merge (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-02 at 1b49913760)\n + pull: don't say that merge is \"the default strategy\"\n\n The advice message given by \"git pull\" when the user hasn't made a\n choice between merge and rebase still said that the merge is the\n default, which no longer is the case. This has been corrected.\n source: <20211118154317.639118-1-alexhenrie24@gmail.com>\n\n\n* bc/require-c99 (2021-12-01) 1 commit\n (merged to 'next' on 2021-12-02 at 76aa8bc2d0)\n + git-compat-util: add a test balloon for C99 support\n (this branch is used by jk/limit-developers-to-gnu99.)\n\n Weather balloon to break people with compilers that do not support\n C99.\n source: <20211201014050.38002-1-sandals@crustytoothpaste.net>\n\n\n* cb/add-p-single-key-fix (2021-11-28) 1 commit\n (merged to 'next' on 2021-12-03 at 8d4f16e620)\n + add -p: avoid use of undefined $key when ReadKey -> EOF\n\n The single-key-input mode in \"git add -p\" had some code to handle\n keys that generate a sequence of input via ReadKey(), which did not\n handle end-of-file correctly, which has been fixed.\n source: <20211128174903.5623-1-carenas@gmail.com>\n\n\n* cb/mingw-gmtime-r (2021-11-27) 1 commit\n (merged to 'next' on 2021-12-03 at 785278d40e)\n + mingw: avoid fallback for {local,gm}time_r()\n\n Build fix on Windows.\n source: \n\n\n* cw/protocol-v2-doc-fix (2021-11-11) 1 commit\n (merged to 'next' on 2021-12-02 at 59f42a7cfc)\n + protocol-v2.txt: align delim-pkt spec with usage\n\n Doc update.\n source: <20211111220048.1702896-1-calvinwan@google.com>\n\n\n* em/missing-pager (2021-11-24) 1 commit\n (merged to 'next' on 2021-12-03 at 22ad721b52)\n + pager: fix crash when pager program doesn't exist\n\n When a non-existent program is given as the pager, we tried to\n reuse an uninitialized child_process structure and crashed, which\n has been fixed.\n source: <20211125000239.2336-1-ematsumiya@suse.de>\n\n\n* en/rebase-x-fix (2021-11-29) 1 commit\n (merged to 'next' on 2021-12-03 at a833829733)\n + sequencer: avoid adding exec commands for non-commit creating commands\n\n \"git rebase -x\" added an unnecessary 'exec' instructions before\n 'noop', which has been corrected.\n source: \n\n\n* gc/remote-with-fewer-static-global-variables (2021-11-18) 5 commits\n (merged to 'next' on 2021-12-02 at d7ea1696e5)\n + remote: die if branch is not found in repository\n + remote: remove the_repository->remote_state from static methods\n + remote: use remote_state parameter internally\n + remote: move static variables into per-repository struct\n + t5516: add test case for pushing remote refspecs\n\n Code clean-up to eventually allow information on remotes defined\n for an arbitrary repository to be read.\n source: <20211118005325.64971-1-chooglen@google.com>\n\n\n* hk/ci-checkwhitespace-commentfix (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-02 at 971178fe99)\n + ci(check-whitespace): update stale file top comments\n\n Comment fix.\n source: \n\n\n* hn/create-reflog-simplify (2021-11-22) 1 commit\n (merged to 'next' on 2021-12-02 at 87ff49b776)\n + refs: drop force_create argument of create_reflog API\n (this branch is used by hn/reftable-coverity-fixes.)\n\n A small simplification of API.\n source: \n\n\n* if/redact-packfile-uri (2021-11-11) 2 commits\n (merged to 'next' on 2021-12-02 at 81213be9ac)\n + http-fetch: redact url on die() message\n + fetch-pack: redact packfile urls in traces\n\n Redact the path part of packfile URI that appears in the trace output.\n source: \n\n\n* ja/doc-cleanup (2021-11-09) 10 commits\n (merged to 'next' on 2021-12-02 at f72204942f)\n + init doc: --shared=0xxx does not give umask but perm bits\n + doc: git-init: clarify file modes in octal.\n + doc: git-http-push: describe the refs as pattern pairs\n + doc: uniformize placeholders' case\n + doc: use three dots for indicating repetition instead of star\n + doc: git-ls-files: express options as optional alternatives\n + doc: use only hyphens as word separators in placeholders\n + doc: express grammar placeholders between angle brackets\n + doc: split placeholders as individual tokens\n + doc: fix git credential synopsis\n\n Doc update.\n source: <20211106184858.11500-1-jn.avila@free.fr>\n\n\n* jc/fix-first-object-walk (2021-10-29) 2 commits\n (merged to 'next' on 2021-12-02 at 43a5c1ec03)\n + docs: add headers in MyFirstObjectWalk\n + docs: fix places that break compilation in MyFirstObjectWalk\n\n Doc update.\n source: \n\n\n* jk/fetch-pack-avoid-sigpipe-to-index-pack (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-02 at e2cc1ae46a)\n + fetch-pack: ignore SIGPIPE when writing to index-pack\n\n \"git fetch\", when received a bad packfile, can fail with SIGPIPE.\n This wasn't wrong per-se, but we now detect the situation and fail\n in a more predictable way.\n source: \n\n\n* jk/jump-merge-with-pathspec (2021-11-09) 1 commit\n (merged to 'next' on 2021-12-02 at fea901973d)\n + git-jump: pass \"merge\" arguments to ls-files\n\n The \"merge\" subcommand of \"git jump\" (in contrib/) silently ignored\n pathspec and other parameters.\n source: \n\n\n* jk/refs-g11-workaround (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-02 at 1025235670)\n + refs: work around gcc-11 warning with REF_HAVE_NEW\n\n Workaround for a false-alarm by gcc-11\n source: \n\n\n* jk/strbuf-addftime-seconds-since-epoch (2021-11-04) 1 commit\n (merged to 'next' on 2021-12-02 at d0b158d899)\n + strbuf_addftime(): handle \"%s\" manually\n\n The \"--date=format:\" gained a workaround for the lack of\n system support for a non-local timezone to handle \"%s\" placeholder.\n source: \n\n\n* jk/t5319-midx-corruption-test-deflake (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 0ac4fd64aa)\n + t5319: corrupt more bytes of the midx checksum\n\n Test fix.\n source: \n\n\n* jk/t7006-sigpipe-tests-fix (2021-11-22) 3 commits\n (merged to 'next' on 2021-12-02 at eefd61931f)\n + t7006: simplify exit-code checks for sigpipe tests\n + t7006: clean up SIGPIPE handling in trace2 tests\n + run-command: unify signal and regular logic for wait_or_whine()\n\n The function to cull a child process and determine the exit status\n had two separate code paths for normal callers and callers in a\n signal handler, and the latter did not yield correct value when the\n child has caught a signal. The handling of the exit status has\n been unified for these two code paths. An existing test with\n flakiness has also been corrected.\n source: \n\n\n* jk/test-bitmap-fix (2021-11-05) 1 commit\n (merged to 'next' on 2021-12-02 at c273d402fb)\n + test_bitmap_hashes(): handle repository without bitmaps\n\n Tighten code for testing pack-bitmap.\n source: \n\n\n* js/ci-no-directional-formatting (2021-11-04) 1 commit\n (merged to 'next' on 2021-12-02 at bc756bc586)\n + ci: disallow directional formatting\n\n CI has been taught to catch some Unicode directional formatting\n sequence that can be used in certain mischief.\n source: \n\n\n* js/trace2-avoid-recursive-errors (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at c5b1e5ddec)\n + trace2: disable tr2_dst before warning on write errors\n\n trace2 error code path fix.\n source: <5a9e49e7f1540d762374382e1769edf112cf093f.1637272706.git.steadmon@google.com>\n\n\n* jt/midx-doc-fix (2021-11-22) 1 commit\n (merged to 'next' on 2021-12-02 at eac9f263ae)\n + Doc: no midx and partial clone relation\n\n Docfix.\n source: <20211122184114.3328662-1-jonathantanmy@google.com>\n\n\n* jt/pack-header-lshift-overflow (2021-11-11) 1 commit\n (merged to 'next' on 2021-12-02 at 89c37479db)\n + packfile: avoid overflowing shift during decode\n\n The code to decode the length of packed object size has been\n corrected.\n source: <20211110234033.3144165-1-jonathantanmy@google.com>\n\n\n* mp/absorb-submodule-git-dir-upon-deinit (2021-11-19) 1 commit\n (merged to 'next' on 2021-12-03 at afc462a692)\n + submodule: absorb git dir instead of dying on deinit\n\n \"git submodule deinit\" for a submodule whose .git metadata\n directory is embedded in its working tree refused to work, until\n the submodule gets converted to use the \"absorbed\" form where the\n metadata directory is stored in superproject, and a gitfile at the\n top-level of the working tree of the submodule points at it. The\n command is taught to convert such submodules to the absorbed form\n as needed.\n source: \n\n\n* po/size-t-for-vs (2021-12-01) 3 commits\n (merged to 'next' on 2021-12-02 at 489c5b0046)\n + object-file.c: LLP64 compatibility, upcast unity for left shift\n + diffcore-delta.c: LLP64 compatibility, upcast unity for left shift\n + repack.c: LLP64 compatibility, upcast unity for left shift\n\n On platforms where ulong is shorter than size_t, code paths that\n shifted 1 or 1U to the left lacked the necessary cast to size_t,\n which have been corrected.\n source: <20211201002902.1042-4-philipoakley@iee.email>\n\n\n* rs/mergesort (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 0490b0ffbd)\n + mergesort: avoid left shift overflow\n\n Bitop fix for platforms whose \"long\" is 32-bit.\n source: <5eabbe1c-4c0f-559a-da21-423afec89e7e@web.de>\n\n\n* tl/midx-docfix (2021-11-18) 1 commit\n (merged to 'next' on 2021-12-02 at 0fae3ebdef)\n + midx: fix a formatting issue in \"multi-pack-index.txt\"\n\n Doc mark-up fix.\n source: <9b910a44f4143c94787110a688f2b17ba4eeb0fc.1637218943.git.dyroneteng@gmail.com>\n\n\n* tw/var-default-branch (2021-11-03) 1 commit\n (merged to 'next' on 2021-12-02 at 944512852e)\n + var: add GIT_DEFAULT_BRANCH variable\n\n \"git var GIT_DEFAULT_BRANCH\" is a way to see what name is used for\n the newly created branch if \"git init\" is run.\n source: <20211103201702.117771-1-thomas@t-8ch.de>\n\n\n* vd/sparse-reset (2021-11-29) 8 commits\n (merged to 'next' on 2021-12-02 at 47b1095f39)\n + unpack-trees: improve performance of next_cache_entry\n + reset: make --mixed sparse-aware\n + reset: make sparse-aware (except --mixed)\n + reset: integrate with sparse index\n + reset: expand test coverage for sparse checkouts\n + sparse-index: update command for expand/collapse test\n + reset: preserve skip-worktree bit in mixed reset\n + reset: rename is_missing to !is_in_reset_tree\n (this branch is used by ds/fetch-pull-with-sparse-index and ld/sparse-diff-blame.)\n\n Various operating modes of \"git reset\" have been made to work\n better with the sparse index.\n source: \n\n\n* vd/sparse-sparsity-fix-on-read (2021-11-24) 4 commits\n (merged to 'next' on 2021-12-02 at 1ec68669cb)\n + sparse-index: update do_read_index to ensure correct sparsity\n + sparse-index: add ensure_correct_sparsity function\n + sparse-index: avoid unnecessary cache tree clearing\n + test-read-cache.c: prepare_repo_settings after config init\n\n Ensure that the sparseness of the in-core index matches the\n index.sparse configuration specified by the repository immediately\n after the on-disk index file is read.\n source: \n\n\n* yn/complete-date-format-options (2021-11-25) 1 commit\n (merged to 'next' on 2021-12-03 at 4f37a904a1)\n + completion: add human and auto: date format\n\n The completion script (in contrib/) learns that the \"--date\"\n option of commands from the \"git log\" family takes \"human\" and\n \"auto\" as valid values.\n source: \n\n--------------------------------------------------\n[New Topics]\n\n* en/sparse-checkout-set (2021-12-08) 10 commits\n - clone: avoid using deprecated `sparse-checkout init`\n - Documentation: clarify/correct a few sparsity related statements\n - git-sparse-checkout.txt: update to document init/set/reapply changes\n - sparse-checkout: enable reapply to take --[no-]{cone,sparse-index}\n - sparse-checkout: enable `set` to initialize sparse-checkout mode\n - sparse-checkout: split out code for tweaking settings config\n - sparse-checkout: disallow --no-stdin as an argument to set\n - sparse-checkout: add sanity-checks on initial sparsity state\n - sparse-checkout: break apart functions for sparse_checkout_(set|add)\n - sparse-checkout: pass use_stdin as a parameter instead of as a global\n\n \n The \"init\" and \"set\" subcommands in \"git sparse-checkout\" have been\n unified for a better user experience and performance.\n\n Need to check the reroll.\n cf. \n source: \n\n\n* hn/reftable-coverity-fixes (2021-12-08) 13 commits\n - reftable: make reftable_record a tagged union\n - reftable: handle null refnames in reftable_ref_record_equal\n - reftable: drop stray printf in readwrite_test\n - reftable: order unittests by complexity\n - reftable: fix NULL derefs in error paths\n - reftable: fix resource warning\n - reftable: ignore remove() return value in stack_test.c\n - reftable: check reftable_stack_auto_compact() return value\n - reftable: fix resource leak blocksource.c\n - reftable: fix resource leak in error path\n - reftable: fix OOB stack write in print functions\n - Merge branch 'hn/create-reflog-simplify' into hn/reftable-coverity-fixes\n - Merge branch 'hn/reftable' into hn/reftable-coverity-fixes\n (this branch uses hn/reftable.)\n\n Problems identified by Coverity in the reftable code have been\n corrected.\n\n source: \n\n\n* jc/make-test-all (2021-12-08) 1 commit\n - Makefile: add test-all target\n\n \"make test\" target in subdirectories of contrib/ are now exercised\n in CI tests.\n\n source: \n\n\n* jk/limit-developers-to-gnu99 (2021-12-08) 2 commits\n - config.mak.dev: specify -std=gnu99 for gcc/clang\n - Merge branch 'bc/require-c99' into jk/limit-developers-to-gnu99\n\n Enable -std=gnu99 option in DEVELOPER builds.\n\n Will merge to 'next'.\n source: \n\n\n* tb/midx-bitmap-corruption-fix (2021-12-08) 2 commits\n - midx.c: make changing the preferred pack safe\n - t5326: demonstrate bitmap corruption after permutation\n\n A bug that made multi-pack bitmap and the object order out-of-sync\n (hence the .midx data gets corrupted) has been fixed.\n\n Will merge to 'next'?\n source: \n\n\n* es/test-chain-lint (2021-12-09) 19 commits\n - t6000-t9999: detect and signal failure within loop\n - t5000-t5999: detect and signal failure within loop\n - t4000-t4999: detect and signal failure within loop\n - t0000-t3999: detect and signal failure within loop\n - tests: simplify by dropping unnecessary `for` loops\n - tests: apply modern idiom for exiting loop upon failure\n - tests: apply modern idiom for signaling test failure\n - tests: fix broken &&-chains in `{...}` groups\n - tests: fix broken &&-chains in `$(...)` command substitutions\n - tests: fix broken &&-chains in compound statements\n - tests: use test_write_lines() to generate line-oriented output\n - tests: simplify construction of large blocks of text\n - t9107: use shell parameter expansion to avoid breaking &&-chain\n - t6300: make `%(raw:size) --shell` test more robust\n - t5516: drop unnecessary subshell and command invocation\n - t4202: clarify intent by creating expected content less cleverly\n - t1020: avoid aborting entire test script when one test fails\n - t1010: fix unnoticed failure on Windows\n - t/lib-pager: use sane_unset() to avoid breaking &&-chain\n\n Broken &&-chains in the test scripts have been corrected.\n\n Will merge to 'next'?\n source: <20211209051115.52629-1-sunshine@sunshineco.com>\n\n\n* jc/flex-array-definition (2021-12-08) 1 commit\n - flex-array: simplify compiler-specific workaround\n\n The conditions to choose different definitions of the FLEX_ARRAY\n macro for vendor compilers has been simplified to make it easier to\n maintain.\n\n Will merge to 'next'?\n source: \n\n\n* jh/make-p4-python3-only (2021-12-09) 6 commits\n - git-p4: Resolve RCS keywords in binary\n - git-p4: Eliminate decode_stream and encode_stream\n - git-p4: Decode byte strings before printing\n - git-p4: Removed support for Python 2\n - git-p4: Don't print shell commands as python lists\n - git-p4: Always pass cmd arguments to subprocess as a python lists\n\n Support for Python2 in \"git p4\" has been removed (not just\n deprecated).\n\n Need to check the reroll.\n cf. <20211210153101.35433-1-jholdsworth@nvidia.com>\n source: <20211209201029.136886-1-jholdsworth@nvidia.com>\n\n--------------------------------------------------\n[Stalled]\n\n* ar/submodule-update (2021-10-13) 9 commits\n . submodule--helper: rename helper functions\n . submodule--helper: remove unused helpers\n . submodule: move core cmd_update() logic to C\n . submodule--helper: run update using child process struct\n . submodule--helper: allow setting superprefix for init_submodule()\n . submodule--helper: refactor get_submodule_displaypath()\n . submodule--helper: rename helpers for update-clone\n . submodule--helper: get remote names from any repository\n . submodule--helper: split up ensure_core_worktree()\n\n Rewrite of \"git submodule update\" in C.\n\n Expecting a reroll?\n cf. \n source: <20211013051805.45662-10-raykar.ath@gmail.com>\n\n\n* ms/customizable-ident-expansion (2021-09-01) 1 commit\n - keyword expansion: make \"$Id$\" string configurable\n\n Instead of \"$Id$\", user-specified string (like $FreeBSD$) can be\n used as an in-blob placeholder for keyword expansion.\n\n Will discard.\n Stalled for too long.\n cf. \n cf. <211101.86fssf3bn3.gmgdl@evledraar.gmail.com>\n source: \n\n--------------------------------------------------\n[Cooking]\n\n* pw/fix-some-issues-in-reset-head (2021-12-08) 14 commits\n - rebase -m: don't fork git checkout\n - rebase --apply: set ORIG_HEAD correctly\n - rebase --apply: fix reflog\n - reset_head(): take struct rebase_head_opts\n - rebase: cleanup reset_head() calls\n - reset_head(): make default_reflog_action optional\n - reset_head(): factor out ref updates\n - create_autostash(): remove unneeded parameter\n - reset_head(): remove action parameter\n - rebase --apply: don't run post-checkout hook if there is an error\n - rebase: do not remove untracked files on checkout\n - rebase: pass correct arguments to post-checkout hook\n - t5403: refactor rebase post-checkout hook tests\n - rebase: factor out checkout for up to date branch\n\n Fix \"some issues\" in a helper function reset_head().\n source: \n\n\n* je/http-better-error-output (2021-12-03) 1 commit\n . http-backend: give a hint that web browser access is not supported\n\n When the http-backend program, which is the server-side component\n for the smart HTTP transport, sends a \"404 Not found\" error, we\n deliberately did not say anything to the requesting client. We now\n send a message back to the browser to tell the user that they do\n not want to visit the URL via their browser, instead of a totally\n blank page.\n\n Expecting a reroll.\n Breaks its self tests.\n cf. <7r23s082-o3q0-479o-srqn-r45q778s5nq7@vanv.qr>\n source: <20211202102855.23907-1-jengelh@inai.de>\n\n\n* es/doc-stdout-vs-stderr (2021-12-04) 1 commit\n (merged to 'next' on 2021-12-07 at d6487c1256)\n + CodingGuidelines: document which output goes to stdout vs. stderr\n\n Coding guideline document has been updated to clarify what goes to\n standard error i nour system.\n\n Will merge to 'master'.\n source: <20211202223110.22062-1-sunshine@sunshineco.com>\n\n\n* tb/pack-revindex-on-disk-cleanup (2021-12-04) 1 commit\n (merged to 'next' on 2021-12-07 at 912c270b70)\n + packfile: make `close_pack_revindex()` static\n\n Code clean-up.\n\n Will merge to 'master'.\n source: \n\n\n* ds/sparse-deep-pattern-checkout-fix (2021-12-06) 2 commits\n (merged to 'next' on 2021-12-07 at 7b7f74216a)\n + unpack-trees: use traverse_path instead of name\n + t1092: add deeper changes during a checkout\n\n The sparse-index/sparse-checkout feature had a bug in its use of\n the matching code to determine which path is in or outside the\n sparse checkout patterns.\n\n Will merge to 'master'.\n source: \n\n\n* en/name-rev-shorter-output (2021-12-04) 1 commit\n (merged to 'next' on 2021-12-10 at ae8ec3912f)\n + name-rev: prefer shorter names over following merges\n\n \"git name-rev\" has been tweaked to give output that is shorter and\n easier to understand.\n\n Will merge to 'master'.\n source: \n\n\n* en/rebase-x-wo-git-dir-env (2021-12-04) 1 commit\n (merged to 'next' on 2021-12-07 at 44f2663314)\n + sequencer: do not export GIT_DIR and GIT_WORK_TREE for 'exec'\n\n \"git rebase -x\" by mistake started exporting the GIT_DIR and\n GIT_WORK_TREE environment variables when the command was rewritten\n in C, which has been corrected.\n\n Will merge to 'master'.\n source: \n\n\n* es/worktree-chatty-to-stderr (2021-12-04) 2 commits\n (merged to 'next' on 2021-12-07 at 84ba7de37c)\n + git-worktree.txt: add missing `-v` to synopsis for `worktree list`\n + worktree: send \"chatty\" messages to stderr\n\n \"git worktree add\" showed \"Preparing worktree\" message to the\n standard output stream, but when it failed, the message from die()\n went to the standard error stream. Depending on the order the\n stdio streams are flushed at the program end, this resulted in\n confusing output. It has been corrected by sending all the chatty\n messages to the standard error stream.\n\n Will merge to 'master'.\n source: <20211203034420.47447-1-sunshine@sunshineco.com>\n\n\n* ja/i18n-similar-messages (2021-12-05) 10 commits\n - i18n: ref-filter: factorize \"%(foo) atom used without %(bar) atom\"\n - i18n: factorize \"--foo outside a repository\"\n - i18n: refactor \"unrecognized %(foo) argument\" strings\n - i18n: factorize \"no directory given for --foo\"\n - i18n: factorize \"--foo requires --bar\" and the like\n - i18n: tag.c factorize i18n strings\n - i18n: standardize \"cannot open\" and \"cannot read\"\n - i18n: turn \"options are incompatible\" into \"are mutually exclusive\"\n - i18n: refactor \"%s, %s and %s are mutually exclusive\"\n - i18n: refactor \"foo and bar are mutually exclusive\"\n\n Similar message templates have been consolidated so that\n translators need to work on fewer number of messages.\n\n Needs review.\n source: \n\n\n* js/test-initial-branch-override-cleanup (2021-12-05) 1 commit\n (merged to 'next' on 2021-12-07 at 0ab3e72b4f)\n + tests: set GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME only when needed\n\n Many tests that used to need GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME\n mechanism to force \"git\" to use 'master' as the default name for\n the initial branch no longer need it; the use of the mechanism from\n them have been removed.\n\n Will merge to 'master'.\n source: \n\n\n* ab/die-with-bug (2021-12-07) 4 commits\n (merged to 'next' on 2021-12-08 at 9b7440fafd)\n + object.c: use BUG(...) no die(\"BUG: ...\") in lookup_object_by_type()\n + pathspec: use BUG(...) not die(\"BUG:%s:%d....\", , )\n + strbuf.h: use BUG(...) not die(\"BUG: ...\")\n + pack-objects: use BUG(...) not die(\"BUG: ...\")\n\n Code clean-up.\n\n Will merge to 'master'.\n source: \n\n\n* ab/usage-die-message (2021-12-07) 6 commits\n - config API: use get_error_routine(), not vreportf()\n - usage.c + gc: add and use a die_message_errno()\n - gc: return from cmd_gc(), don't call exit()\n - usage.c API users: use die_message() for error() + exit 128\n - usage.c API users: use die_message() for \"fatal :\" + exit 128\n - usage.c: add a die_message() routine\n\n Code clean-up to hide vreportf() from public API.\n\n Needs review.\n source: \n\n\n* js/compat-util-msvc-flex-array (2021-12-06) 1 commit\n - git-compat-util(msvc): C11 does not imply support for zero-sized arrays\n\n MSVC build started to break on flex arrays?\n\n Will merge to 'next'?\n source: \n\n\n* ab/common-main-cleanup (2021-12-07) 1 commit\n - common-main.c: call exit(), don't return\n\n Code clean-up.\n\n Will merge to 'next'?\n source: \n\n\n* ab/fetch-set-upstream-while-detached (2021-12-07) 1 commit\n - pull, fetch: fix segfault in --set-upstream option\n\n \"git fetch --set-upstream\" did not check if there is a current\n branch, leading to a segfault when it is run on a detached HEAD,\n which has been corrected.\n\n Will merge to 'next'.\n source: \n\n\n* ew/cbtree-remove-unused-and-broken-cb-unlink (2021-12-07) 1 commit\n (merged to 'next' on 2021-12-07 at e37b4e16d0)\n + cbtree: remove broken and unused cb_unlink\n\n Code clean-up.\n\n Will merge to 'master'.\n source: <20211207183810.688481-1-e@80x24.org>\n\n\n* ab/cat-file (2021-12-08) 10 commits\n - cat-file: use GET_OID_ONLY_TO_DIE in --(textconv|filters)\n - object-name.c: don't have GET_OID_ONLY_TO_DIE imply *_QUIETLY\n - cat-file: correct and improve usage information\n - cat-file: fix remaining usage bugs\n - cat-file: make --batch-all-objects a CMDMODE\n - cat-file: move \"usage\" variable to cmd_cat_file()\n - cat-file docs: fix SYNOPSIS and \"-h\" output\n - parse-options API: add a usage_msg_optf()\n - cat-file tests: test messaging on bad objects/paths\n - cat-file tests: test bad usage\n\n Assorted updates to \"git cat-file\", especially \"-h\".\n source: \n\n\n* ab/grep-patterntype (2021-12-04) 7 commits\n - grep: simplify config parsing and option parsing\n - grep API: call grep_config() after grep_init()\n - grep.c: don't pass along NULL callback value\n - built-ins: trust the \"prefix\" from run_builtin()\n - grep tests: add missing \"grep.patternType\" config test\n - log tests: check if grep_config() is called by \"log\"-like cmds\n - grep.h: remove unused \"regex_t regexp\" from grep_opt\n\n Some code clean-up in the \"git grep\" machinery.\n\n Needs review.\n source: \n\n\n* js/use-builtin-add-i (2021-12-08) 3 commits\n - fixup! add -i: default to the built-in implementation\n - add -i: default to the built-in implementation\n - t2016: require the PERL prereq only when necessary\n\n \"git add -i\" was rewritten in C some time ago and has been in\n testing; the reimplementation is now exposed to general public by\n default.\n\n On hold.\n There are known breakages on macOS.\n cf. \n source: \n\n\n* jt/conditional-config-on-remote-url (2021-12-04) 2 commits\n - config: include file if remote URL matches a glob\n - config: make git_config_include() static\n\n The conditional inclusion mechanism of configuration files using\n \"[includeIf ]\" learns to base its decision on the\n URL of the remote repository the repository interacts with.\n\n Needs review.\n source: \n\n\n* tb/cruft-packs (2021-11-29) 17 commits\n - sha1-file.c: don't freshen cruft packs\n - builtin/gc.c: conditionally avoid pruning objects via loose\n - builtin/repack.c: add cruft packs to MIDX during geometric repack\n - builtin/repack.c: use named flags for existing_packs\n - builtin/repack.c: allow configuring cruft pack generation\n - builtin/repack.c: support generating a cruft pack\n - builtin/pack-objects.c: --cruft with expiration\n - reachable: report precise timestamps from objects in cruft packs\n - reachable: add options to add_unseen_recent_objects_to_traversal\n - builtin/pack-objects.c: --cruft without expiration\n - builtin/pack-objects.c: return from create_object_entry()\n - t/helper: add 'pack-mtimes' test-tool\n - pack-mtimes: support writing pack .mtimes files\n - chunk-format.h: extract oid_version()\n - pack-write: pass 'struct packing_data' to 'stage_tmp_packfiles'\n - pack-mtimes: support reading .mtimes files\n - Documentation/technical: add cruft-packs.txt\n\n Instead of leaving unreachable objects in loose form when packing,\n or ejecting them into loose form when repacking, gather them in a\n packfile with an auxiliary file that records the last-use time of\n these objects.\n\n Expecting a reroll.\n source: \n\n\n* cb/save-term-across-editor-invocation (2021-12-01) 3 commits\n - fixup! editor: allow for saving/restoring terminal state\n - editor: allow for saving/restoring terminal state\n - terminal: teach save_term to fail when not foreground\n\n Some editors are reported to leave the terminal in funny state\n after they exit on Windows. Work it around by saving and restoring\n the terminal state when needed.\n\n Expecting a reroll.\n cf. \n source: <20211202035446.1154-1-carenas@gmail.com>\n\n\n* jk/log-decorate-opts-with-implicit-decorate (2021-12-01) 2 commits\n (merged to 'next' on 2021-12-10 at 80585b2755)\n + log: load decorations with --simplify-by-decoration\n + log: handle --decorate-refs with userformat \"%d\"\n\n When \"git log\" implicitly enabled the \"decoration\" processing\n without being explicitly asked with \"--decorate\" option, it failed\n to read and honor the settings given by the \"--decorate-refs\"\n option.\n\n Will merge to 'master'.\n source: \n\n\n* jl/subtree-check-parents-argument-passing-fix (2021-12-05) 1 commit\n - subtree: fix argument handling in check_parents\n\n Fix performance-releated bug in \"git subtree\" (in contrib/).\n\n Expecting a reroll.\n cf. \n source: \n\n\n* ab/ambiguous-object-name (2021-11-26) 6 commits\n - object-name: re-use \"struct strbuf\" in show_ambiguous_object()\n - object-name: iterate ambiguous objects before showing header\n - object-name: show date for ambiguous tag objects\n - object-name: make ambiguous object output translatable\n - object-name: explicitly handle OBJ_BAD in show_ambiguous_object()\n - object-name tests: add tests for ambiguous object blind spots\n\n Error output given in response to an ambiguous object name has been\n improved.\n\n Needs review.\n An earlier iteration that was much smaller had seen some reviews,\n but the latest round enlarged its scope and needs to be reviewed\n afresh.\n source: \n\n\n* ds/trace2-regions-in-tests (2021-11-29) 2 commits\n (merged to 'next' on 2021-12-07 at ebf31cbaad)\n + t/t*: remove custom GIT_TRACE2_EVENT_NESTING\n + test-lib.sh: set GIT_TRACE2_EVENT_NESTING\n\n The default setting for trace2 event nesting was too low to cause\n test failures, which is worked around by bumping it up in the test\n framework.\n\n Will merge to 'master'.\n source: \n\n\n* hn/allow-bogus-oid-in-ref-tests (2021-12-07) 8 commits\n (merged to 'next' on 2021-12-08 at 8fb70ef68b)\n + t1430: create valid symrefs using test-helper\n + t1430: remove refs using test-tool\n + refs: introduce REF_SKIP_REFNAME_VERIFICATION flag\n + refs: introduce REF_SKIP_OID_VERIFICATION flag\n + refs: update comment.\n + test-ref-store: plug memory leak in cmd_delete_refs\n + test-ref-store: parse symbolic flag constants\n + test-ref-store: remove force-create argument for create-reflog\n\n The test helper for refs subsystem learned to write bogus and/or\n nonexistent object name to refs to simulate error situations we\n want to test Git in.\n\n Will merge to 'master'.\n source: \n\n\n* hn/t1404-df-limitation-is-ref-files-only (2021-11-29) 1 commit\n (merged to 'next' on 2021-12-07 at 074438a4ba)\n + t1404: mark directory/file conflict tests with REFFILES\n\n Test update.\n\n Will merge to 'master'.\n source: \n\n\n* jc/reflog-iterator-callback-doc (2021-11-28) 1 commit\n (merged to 'next' on 2021-12-08 at ba5693952d)\n + refs: document callback for reflog-ent iterators\n\n Document the parameters given to the reflog entry iterator callback\n functions.\n\n Will merge to 'master'.\n source: \n\n\n* jc/grep-patterntype-default-doc (2021-12-05) 1 commit\n (merged to 'next' on 2021-12-10 at e46385ad9d)\n + grep: clarify what `grep.patternType=default` means\n\n Doc update.\n\n Will merge to 'master'.\n source: \n\n\n* ab/ci-updates (2021-11-23) 5 commits\n (merged to 'next' on 2021-12-07 at 1d855a6b33)\n + CI: don't run \"make test\" twice in one job\n + CI: use \"$runs_on_pool\", not \"$jobname\" to select packages & config\n + CI: rename the \"Linux32\" job to lower-case \"linux32\"\n + CI: use shorter names that fit in UX tooltips\n + CI: remove Travis CI support\n\n Drop support for TravisCI and update test workflows at GitHub.\n\n Will merge to 'master'.\n source: \n\n\n* en/keep-cwd (2021-12-09) 11 commits\n - t2501: simplify the tests since we can now assume desired behavior\n - dir: new flag to remove_dir_recurse() to spare the original_cwd\n - dir: avoid incidentally removing the original_cwd in remove_path()\n - stash: do not attempt to remove startup_info->original_cwd\n - rebase: do not attempt to remove startup_info->original_cwd\n - clean: do not attempt to remove startup_info->original_cwd\n - symlinks: do not include startup_info->original_cwd in dir removal\n - unpack-trees: add special cwd handling\n - unpack-trees: refuse to remove startup_info->original_cwd\n - setup: introduce startup_info->original_cwd\n - t2501: add various tests for removing the current working directory\n\n Many git commands that deal with working tree files try to remove a\n directory that becomes empty (i.e. \"git switch\" from a branch that\n has the directory to another branch that does not would attempt\n remove all files in the directory and the directory itself). This\n drops users into an unfamiliar situation if the command was run in\n a subdirectory that becomes subject to removal due to the command.\n The commands have been taught to keep an empty directory if it is\n the directory they were started in to avoid surprising users.\n\n Will merge to 'next'?\n source: \n\n\n* ab/run-command (2021-11-25) 9 commits\n (merged to 'next' on 2021-12-07 at 5c0bedf853)\n + run-command API: remove \"env\" member, always use \"env_array\"\n + difftool: use \"env_array\" to simplify memory management\n + run-command API: remove \"argv\" member, always use \"args\"\n + run-command API users: use strvec_push(), not argv construction\n + run-command API users: use strvec_pushl(), not argv construction\n + run-command tests: use strvec_pushv(), not argv assignment\n + run-command API users: use strvec_pushv(), not argv assignment\n + upload-archive: use regular \"struct child_process\" pattern\n + worktree: stop being overly intimate with run_command() internals\n\n API clean-up.\n\n Will merge to 'master'.\n cf. <211130.86k0gpcpy2.gmgdl@evledraar.gmail.com>\n cf. \n source: \n\n\n* hn/reflog-tests (2021-12-02) 5 commits\n (merged to 'next' on 2021-12-07 at 84d4e4b211)\n + refs/debug: trim trailing LF from reflog message\n + test-ref-store: tweaks to for-each-reflog-ent format\n + t1405: check for_each_reflog_ent_reverse() more thoroughly\n + test-ref-store: don't add newline to reflog message\n + show-branch: show reflog message\n\n Prepare tests on ref API to help testing reftable backends.\n\n Will merge to 'master'.\n source: \n\n\n* tl/ls-tree-oid-only (2021-11-22) 1 commit\n - ls-tree.c: support `--oid-only` option for \"git-ls-tree\"\n\n \"git ls-tree\" learns \"--oid-only\" option, similar to \"--name-only\".\n\n Expecting a reroll.\n source: <6c15b4c176b7c03072fa59a4efd9f6fea7d62eae.1637567328.git.dyroneteng@gmail.com>\n\n\n* ab/make-dependency (2021-11-18) 24 commits\n - Makefile: move \".SUFFIXES\" rule to shared.mak\n - Makefile: define $(LIB_H) in terms of $(FIND_SOURCE_FILES)\n - Makefile: disable GNU make built-in wildcard rules\n - Makefile: use $(file) I/O instead of \"FORCE\" when possible\n - Makefile: correct the dependency graph of hook-list.h\n - Makefiles: add and use wildcard \"mkdir -p\" template\n - Makefile: use $(wspfx) for $(QUIET...) in shared.mak\n - Makefile: add \"$(QUIET)\" boilerplate to shared.mak\n - Makefile: add a \"TRACK_template\" for GIT-*{FLAGS,DEFINES,...}\n - Makefile: re-add and use the \"shellquote\" macros\n - Makefile: move $(comma), $(empty) and $(space) to shared.mak\n - Makefiles: add \"shared.mak\", move \".DELETE_ON_ERROR\" to it\n - Makefile: stop needing @@GIT_VERSION@@ in *.perl scripts\n - Makefile: create a GIT-PYTHON-DEFINES, like \"PERL\"\n - Makefile: correct \"GIT-PERL-{DEFINES,HEADER}\" dependency graph\n - Makefile: adjust Perl-related comments & whitespace\n - Makefile: change \"ifndef NO_PERL\" to \"ifdef NO_PERL\"\n - Makefile: guard Perl-only variable assignments\n - Makefile: remove \"mv $@ $@+\" dance redundant to .DELETE_ON_ERROR\n - Makefile: clean perl/build/ even with NO_PERL=Y\n - Makefile: use \"=\" not \":=\" for po/* and perl/*\n - Makefile: don't set up \"perl/build\" rules under NO_PERL=Y\n - Makefile: don't invoke msgfmt with --statistics\n - Merge branch 'ab/sh-retire-helper-functions' into ab/make-dependency\n\n Dependency clean-up.\n\n Needs review.\n There are some comments on earlier rounds; the latest one needs a\n serious review or at least Acks from past commentors.\n source: \n\n\n* ds/fetch-pull-with-sparse-index (2021-12-08) 6 commits\n . test-read-cache: remove --table, --expand options\n . t1091/t3705: remove 'test-tool read-cache --table'\n . t1092: replace 'read-cache --table' with 'ls-files --sparse'\n . ls-files: add --sparse option\n . fetch/pull: use the sparse index\n . Merge branch 'ld/sparse-diff-blame' into ds/fetch-pull-with-sparse-index\n (this branch uses ld/sparse-diff-blame.)\n\n \"git fetch\" and \"git pull\" are now declared sparse-index clean.\n Also \"git ls-files\" learns the \"--sparse\" option to help debugging.\n\n Ejected from 'seen', as it seems to fail its self-test.\n source: \n\n\n* fs/ssh-signing-other-keytypes (2021-11-19) 2 commits\n (merged to 'next' on 2021-12-10 at 2d0c8cb8e6)\n + ssh signing: make sign/amend test more resilient\n + ssh signing: support non ssh-* keytypes\n\n The cryptographic signing using ssh keys can specify literal keys\n for keytypes whose name do not begin with the \"ssh-\" prefix by\n using the \"key::\" prefix mechanism (e.g. \"key::ecdsa-sha2-nistp256\").\n\n Will merge to 'master'.\n source: <20211119150707.3924636-1-fs@gigacodes.de>\n\n\n* fs/test-prereq (2021-12-01) 3 commits\n (merged to 'next' on 2021-12-07 at fc8a8e0006)\n + test-lib: make BAIL_OUT() work in tests and prereq\n + test-lib: introduce required prereq for test runs\n + test-lib: show missing prereq summary\n\n The test framework learns to list unsatisfied test prerequisites,\n and optionally error out when prerequisites that are expected to be\n satisfied are not.\n\n Will merge to 'master'.\n source: <20211201085315.576865-1-fs@gigacodes.de>\n\n\n* pw/xdiff-classify-record-in-histogram (2021-12-04) 6 commits\n (merged to 'next' on 2021-12-07 at 8cdad7bc9a)\n + xdiff: drop unused flags parameter from recs_match\n + xdiff: drop xpparam_t parameter from histogram cmp_recs()\n + xdiff: drop CMP_ENV macro from xhistogram\n (merged to 'next' on 2021-12-02 at 5ccd12d09b)\n + xdiff: simplify comparison\n + xdiff: avoid unnecessary memory allocations\n + diff histogram: intern strings\n\n \"diff --histogram\" optimization.\n\n Will merge to 'master'.\n source: \n source: \n\n\n* xw/am-empty (2021-12-07) 3 commits\n - am: support --allow-empty to record specific empty patches\n - am: support --empty=