From: Junio C Hamano Date: Fri, 29 Jul 2022 23:13:42 +0000 (-0700) Subject: What's cooking (2022/07 #08) X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56913890e19ba6350770fcb70cb91831f66e139b;p=thirdparty%2Fgit.git What's cooking (2022/07 #08) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 2f430c3585..829a943a2a 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,9 +1,9 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2022, #07; Fri, 22) -X-master-at: 6a475b71f8c4ce708d69fdc9317aefbde3769e25 -X-next-at: a8f742fd52ac1e242fca73527be643aa60514c94 +Subject: What's cooking in git.git (Jul 2022, #08; Fri, 29) +X-master-at: 23b219f8e3f2adfb0441e135f0a880e6124f766c +X-next-at: 78731f0fdbef5bf997eda274d67cbd79ffaaf815 -What's cooking in git.git (Jul 2022, #07; Fri, 22) +What's cooking in git.git (Jul 2022, #08; Fri, 29) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -43,72 +43,75 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* gc/bare-repo-discovery (2022-07-14) 5 commits - (merged to 'next' on 2022-07-15 at 5206577852) - + setup.c: create `safe.bareRepository` - + safe.directory: use git_protected_config() - + config: learn `git_protected_config()` - + Documentation: define protected configuration - + Documentation/git-config.txt: add SCOPES section +* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit + (merged to 'next' on 2022-07-19 at f77cd40c29) + + trace2: only include "fsync" events if we git_fsync() - Introduce a discovery.barerepository configuration variable that - allows users to forbid discovery of bare repositories. - source: + Omit fsync-related trace2 entries when their values are all zero. + source: -* js/ci-github-workflow-markup (2022-07-14) 1 commit - (merged to 'next' on 2022-07-15 at 196166f671) - + tests: fix incorrect --write-junit-xml code +* ds/doc-wo-whitelist (2022-07-19) 5 commits + (merged to 'next' on 2022-07-20 at ec51c6269a) + + transport.c: avoid "whitelist" + + t: avoid "whitelist" + + git.txt: remove redundant language + + git-cvsserver: clarify directory list + + daemon: clarify directory arguments - A fix for a regression in test framework. - source: + Avoid "white/black-list" in documentation and code comments. + source: -* js/shortlog-sort-stably (2022-07-14) 1 commit - (merged to 'next' on 2022-07-15 at 75e4efe678) - + shortlog: use a stable sort +* ds/win-syslog-compiler-fix (2022-07-19) 1 commit + (merged to 'next' on 2022-07-20 at d38b649b18) + + compat/win32: correct for incorrect compiler warning - "git shortlog -n" relied on the underlying qsort() to be stable, - which shouldn't have. Fixed. - source: + Workaround for a false positive compiler warning. + source: -* js/vimdiff-quotepath-fix (2022-07-14) 1 commit - (merged to 'next' on 2022-07-15 at 4273bbd4b4) - + mergetool(vimdiff): allow paths to contain spaces again +* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit + (merged to 'next' on 2022-07-19 at bcc29d823d) + + commit-graph: pass repo_settings instead of repository - Variable quoting fix in the vimdiff driver of "git mergetool" - source: + API tweak to make it easier to run fuzz testing on commit-graph parser. + source: -* rs/mingw-tighten-mkstemp (2022-07-14) 1 commit - (merged to 'next' on 2022-07-15 at 4dd4a117ec) - + mingw: avoid mktemp() in mkstemp() implementation +* ld/osx-keychain-usage-fix (2022-07-19) 1 commit + (merged to 'next' on 2022-07-20 at eebd316ef6) + + osx-keychain: fix compiler warning - mkstemp() emulation on Windows has been improved. - source: <7265e37f-fd29-3579-b840-19a1df52a59f@web.de> + Workaround for a compiler warning against use of die() in + osx-keychain (in contrib/). + source: --------------------------------------------------- -[New Topics] -* ab/leak-check (2022-07-20) 14 commits - - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks - - upload-pack: fix a memory leak in create_pack_file() - - leak tests: mark passing SANITIZE=leak tests as leak-free - - test-lib: have the "check" mode for SANITIZE=leak consider leak logs - - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode - - test-lib: simplify by removing test_external - - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh - - t/Makefile: don't remove test-results in "clean-except-prove-cache" - - test-lib: add a SANITIZE=leak logging mode - - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description - - test-lib: add a --invert-exit-code switch - - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT - - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler - - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_ +* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit + (merged to 'next' on 2022-07-19 at c259b61b0e) + + config/core.txt: fix minor issues for `core.sparseCheckoutCone` + + Docfix. + source: <20220718100530.2068354-1-martin.agren@gmail.com> - Plugging more leaks. - source: + +* ma/t4200-update (2022-07-18) 1 commit + (merged to 'next' on 2022-07-19 at 710d0cafd9) + + t4200: drop irrelevant code + + Test fix. + source: <20220718154322.2177166-1-martin.agren@gmail.com> + + +* mb/config-document-include (2022-07-17) 1 commit + (merged to 'next' on 2022-07-19 at 8267b80aa2) + + config.txt: document include, includeIf + + Add missing documentation for "include" and "includeIf" features in + "git config" file format, which incidentally teaches the command + line completion to include them in its offerings. + source: * mb/p4-fixes (2022-07-20) 2 commits @@ -117,8 +120,6 @@ Release tarballs are available at: + git-p4: fix typo in P4Submit.applyCommit() Fix a few issues in "git p4". - - Will merge to 'master'. source: @@ -128,50 +129,259 @@ Release tarballs are available at: "git p4" working on UTF-16 files on Windows did not implement CRLF-to-LF conversion correctly, which has been corrected. + source: + + +* sg/index-format-doc-update (2022-07-18) 1 commit + (merged to 'next' on 2022-07-19 at ccc384be5e) + + index-format.txt: remove outdated list of supported extensions + + Docfix. + source: <20220718085640.7395-1-szeder.dev@gmail.com> + + +* tl/pack-bitmap-error-messages (2022-07-18) 6 commits + (merged to 'next' on 2022-07-19 at 3f9565653a) + + pack-bitmap.c: continue looping when first MIDX bitmap is found + + pack-bitmap.c: using error() instead of silently returning -1 + + pack-bitmap.c: do not ignore error when opening a bitmap file + + pack-bitmap.c: rename "idx_name" to "bitmap_name" + + pack-bitmap.c: mark more strings for translations + + pack-bitmap.c: fix formatting of error messages + + Tweak various messages that come from the pack-bitmap codepaths. + source: + + +* vd/scalar-doc (2022-07-18) 2 commits + (merged to 'next' on 2022-07-20 at fab0234da4) + + scalar: convert README.md into a technical design doc + + scalar: reword command documentation to clarify purpose + + Doc update. + source: + +-------------------------------------------------- +[New Topics] + +* tb/cat-file-z (2022-07-22) 2 commits + (merged to 'next' on 2022-07-28 at 78731f0fdb) + + builtin/cat-file.c: support NUL-delimited input with `-z` + + t1006: extract --batch-command inputs to variables + + Operating modes like "--batch" of "git cat-file" command learned to + take NUL-terminated input, instead of one-item-per-line. Will merge to 'master'. - source: + source: + + +* ab/tech-docs-to-help (2022-07-23) 9 commits + - docs: move multi-pack-index docs to man section 5 + - docs: move http-protocol docs to man section 5 + - docs: move pack format docs to man section 5 + - docs: move protocol-related docs to man section 5 + - docs: move commit-graph format docs to man section 5 + - git docs: add a category for file formats, protocols and interfaces + - git docs: add a category for user-facing file, repo and command UX + - git help doc: use "" instead of "" + - help.c: BUG() out if "help --guides" can't remove "git" prefixes + + Expose a lot of "tech docs" via "git help" interface. + source: + + +* sg/parse-options-subcommand (2022-07-25) 20 commits + - builtin/worktree.c: let parse-options parse subcommands + - builtin/stash.c: let parse-options parse subcommands + - builtin/sparse-checkout.c: let parse-options parse subcommands + - builtin/remote.c: let parse-options parse subcommands + - builtin/reflog.c: let parse-options parse subcommands + - builtin/notes.c: let parse-options parse subcommands + - builtin/multi-pack-index.c: let parse-options parse subcommands + - builtin/hook.c: let parse-option parse subcommands + - builtin/gc.c: let parse-options parse 'git maintenance's subcommands + - builtin/commit-graph.c: let parse-options parse subcommands + - builtin/bundle.c: let parse-options parse subcommands + - parse-options: add support for parsing subcommands + - parse-options: drop leading space from '--git-completion-helper' output + - parse-options: clarify the limitations of PARSE_OPT_NODASH + - parse-options: PARSE_OPT_KEEP_UNKNOWN only applies to --options + - api-parse-options.txt: fix description of OPT_CMDMODE + - t0040-parse-options: test parse_options() with various 'parse_opt_flags' + - t5505-remote.sh: check the behavior without a subcommand + - t3301-notes.sh: check that default operation mode doesn't take arguments + - git.c: update NO_PARSEOPT markings + + Introduce the "subcommand" mode to parse-options API and update the + command line parser of Git commands with subcommands. + source: <20220725123857.2773963-1-szeder.dev@gmail.com> + + +* ds/bundle-uri-clone (2022-07-25) 5 commits + - clone: --bundle-uri cannot be combined with --depth + - bundle-uri: add support for http(s):// and file:// + - clone: add --bundle-uri option + - bundle-uri: create basic file-copy logic + - remote-curl: add 'get' capability + Implement "git clone --bundle-uri". + source: -* jc/string-list-cleanup (2022-07-20) 1 commit - - builtin/remote.c: use the right kind of STRING_LIST_INIT - Code clean-up. +* ca/unignore-local-installation-on-windows (2022-07-27) 1 commit + - cmake: support local installations of git + + Fix build procedure for Windows that uses CMake so that it can pick + up the shell interpreter from local installation location. Will merge to 'next'. - source: + source: -* mt/pkt-line-comment-tweak (2022-07-22) 1 commit - (merged to 'next' on 2022-07-22 at 4004fa75eb) - + pkt-line.h: move comment closer to the associated code +* ds/decorate-filter-tweak (2022-07-29) 10 commits + - fetch: use ref_namespaces during prefetch + - maintenance: stop writing log.excludeDecoration + - log: create log.decorateFilter=all + - log: add --decorate-all option + - log: add default decoration filter + - log-tree: use ref_namespaces instead of if/else-if + - refs: use ref_namespaces for replace refs base + - refs: add array of ref namespaces + - t4207: test coloring of grafted decorations + - refs: allow "HEAD" as decoration filter + + The namespaces used by "log --decorate" from "refs/" hierarchy by + default has been tightened. + source: - In-code comment clarification. + +* gc/bare-repo-discovery (2022-07-26) 1 commit + (merged to 'next' on 2022-07-28 at 1d2bef98f6) + + config.c: NULL check when reading protected config + + Fix-up for what has been merged to 'master' recently. Will merge to 'master'. - source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br> + source: -* mt/rot13-in-c (2022-07-22) 3 commits - - t/t0021: replace old rot13-filter.pl uses with new test-tool cmd - - t/t0021: convert the rot13-filter.pl script to C - - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c - (this branch uses mt/checkout-count-fix.) +* jr/gitweb-title-shortening (2022-07-26) 1 commit + (merged to 'next' on 2022-07-28 at 7528e87220) + + gitweb: remove title shortening heuristics - Test portability improvements. + Gitweb had legacy URL shortener that is specific to the way + projects hosted on kernel.org used to (but no longer) work, which + has been removed. - Needs review. - source: + Will merge to 'master'. + source: <20220726135911.ycvgwbkixb3ei6w3@jrouhaud> -* tk/untracked-cache-with-uall (2022-07-22) 1 commit - - read-cache: make `do_read_index()` always set up `istate->repo` +* es/doc-creation-factor-fix (2022-07-28) 2 commits + - range-diff: clarify --creation-factor= + - format-patch: clarify --creation-factor= - Fix for a bug that makes write-tree to faile to write out a - non-existent index as a tree, introduced in 2.37. + Expecting a reroll. + source: <7229p500-p2r4-on87-6802-8o90s36rr3s4@tzk.qr> + + +* js/lstat-mingw-enotdir-fix (2022-07-29) 1 commit + - lstat(mingw): correctly detect ENOTDIR scenarios + + Fix to lstat() emulation on Windows. Will merge to 'next'. - source: <20220722212232.833188-1-martin.agren@gmail.com> + source: + + +* js/mingw-with-python (2022-07-29) 3 commits + - mingw: remove unneeded `NO_CURL` directive + - mingw: remove unneeded `NO_GETTEXT` directive + - windows: include the Python bits when building Git for Windows + + Conditionally allow building Python interpreter on Windows + + Will merge to 'next'. + source: + + +* ab/submodule-helper-prep (2022-07-28) 20 commits + - submodule--helper: fix bad config API usage + - submodule--helper: don't exit() on failure, return + - submodule--helper: add skeleton "goto cleanup" to update_submodule() + - submodule--helper: rename "int res" to "int ret" + - submodule--helper: refactor "errmsg_str" to be a "struct strbuf" + - submodule--helper: add "const" to copy of "update_data" + - submodule--helper: pass a "const struct module_clone_data" to clone_submodule() + - submodule--helper: stop conflating "sb" in clone_submodule() + - submodule--helper: convert a strbuf_detach() to xstrfmt() + - submodule--helper: replace memset() with { 0 }-initialization + - submodule--helper style: add \n\n after variable declarations + - submodule--helper style: don't separate declared variables with \n\n + - submodule--helper: move "resolve-relative-url-test" to a test-tool + - submodule--helper: move "check-name" to a test-tool + - submodule--helper: move "is-active" to a test-tool + - test-tool submodule-config: remove unused "--url" handling + - submodule--helper: remove unused "list" helper + - submodule--helper: remove unused "name" helper + - submodule tests: test for "add " + - submodule tests: test usage behavior + (this branch is used by ab/submodule-helper-leakfix.) + + source: + + +* ab/dedup-config-and-command-docs (2022-07-29) 9 commits + - docs: add CONFIGURATION sections that fuzzy map to built-ins + - docs: add CONFIGURATION sections that map to a built-in + - log docs: de-duplicate configuration sections + - difftool docs: de-duplicate configuration sections + - notes docs: de-duplicate configuration sections + - apply docs: de-duplicate configuration sections + - send-email docs: de-duplicate configuration sections + - grep docs: de-duplicate configuration sections + - docs: add and use include template for config/* includes + + Share the text used to explain configuration variables used by "git + " in "git help " with the text from "git help config". + + Will merge to 'next'? + source: + + +* jk/struct-zero-init-with-older-gcc (2022-07-29) 1 commit + - config.mak.dev: squelch -Wno-missing-braces for older gcc + + Older gcc with -Wall complains about the universal zero initializer + "struct s = { 0 };" idiom, which makes developers' lives + inconvenient (as -Werror is enabled by DEVELOPER=YesPlease). The + build procedure has been tweaked to help them with thes compilers. + + Will merge to 'next'. + source: + + +* js/ort-clean-up-after-failed-merge (2022-07-29) 2 commits + - merge-ort: do leave trace2 region even if checkout fails + - merge-ort: clean up after failed merge + + Plug memory leaks in the failure code path in the "merge-ort" merge + strategy backend. + + Will merge to 'next'? + source: + + +* js/t5351-freebsd-fix (2022-07-29) 2 commits + - t5351: avoid using `test_cmp` for binary data + - t5351: avoid relying on `core.fsyncMethod = batch` to be supported + + Some tests assumed that core.fsyncMethod=batch is supported + everywhere, which broke FreeBSD. + + Will merge to 'next'. + source: -------------------------------------------------- [Stalled] @@ -201,97 +411,98 @@ Release tarballs are available at: cf. source: <20220407215352.3491567-1-sandals@crustytoothpaste.net> +-------------------------------------------------- +[Cooking] -* cw/remote-object-info (2022-05-06) 11 commits - - SQUASH??? coccicheck - - SQUASH??? ensure that coccicheck is happy - - SQUASH??? compilation fix - - cat-file: add --batch-command remote-object-info command - - cat-file: move parse_cmd and DEFAULT_FORMAT up - - transport: add object-info fallback to fetch - - transport: add client side capability to request object-info - - object-info: send attribute packet regardless of object ids - - object-store: add function to free object_info contents - - fetch-pack: move fetch default settings +* cw/remote-object-info (2022-07-28) 6 commits + - 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. + source: <20220728230210.2952731-1-calvinwan@google.com> - Expecting a reroll. - source: <20220502170904.2770649-1-calvinwan@google.com> - --------------------------------------------------- -[Cooking] -* ds/midx-with-less-memory (2022-07-19) 3 commits - (merged to 'next' on 2022-07-20 at 250d257c3e) - + midx: reduce memory pressure while writing bitmaps - + midx: extract bitmap write setup - + pack-bitmap-write: use const for hashes - - The codepath to write multi-pack index has been taught to release a - large chunk of memory that holds an array of objects in the packs, - as soon as it is done with the array, to reduce memory consumption. +* ab/leak-check (2022-07-27) 15 commits + - CI: use "GIT_TEST_SANITIZE_LEAK_LOG=true" in linux-leaks + - upload-pack: fix a memory leak in create_pack_file() + - leak tests: mark passing SANITIZE=leak tests as leak-free + - leak tests: don't skip some tests under SANITIZE=leak + - test-lib: have the "check" mode for SANITIZE=leak consider leak logs + - test-lib: add a GIT_TEST_PASSING_SANITIZE_LEAK=check mode + - test-lib: simplify by removing test_external + - tests: move copy/pasted PERL + Test::More checks to a lib-perl.sh + - t/Makefile: don't remove test-results in "clean-except-prove-cache" + - test-lib: add a SANITIZE=leak logging mode + - t/README: reword the "GIT_TEST_PASSING_SANITIZE_LEAK" description + - test-lib: add a --invert-exit-code switch + - test-lib: fix GIT_EXIT_OK logic errors, use BAIL_OUT + - test-lib: don't set GIT_EXIT_OK before calling test_atexit_handler + - test-lib: use $1, not $@ in test_known_broken_{ok,failure}_ - Will merge to 'master'. - source: + Plugging more leaks. + source: -* ma/sparse-checkout-cone-doc-fix (2022-07-18) 1 commit - (merged to 'next' on 2022-07-19 at c259b61b0e) - + config/core.txt: fix minor issues for `core.sparseCheckoutCone` +* jc/string-list-cleanup (2022-07-20) 1 commit + (merged to 'next' on 2022-07-27 at 858a0b2a28) + + builtin/remote.c: use the right kind of STRING_LIST_INIT - Docfix. + Code clean-up. Will merge to 'master'. - source: <20220718100530.2068354-1-martin.agren@gmail.com> + source: -* ma/t4200-update (2022-07-18) 1 commit - (merged to 'next' on 2022-07-19 at 710d0cafd9) - + t4200: drop irrelevant code +* mt/pkt-line-comment-tweak (2022-07-22) 1 commit + (merged to 'next' on 2022-07-22 at 4004fa75eb) + + pkt-line.h: move comment closer to the associated code - Test fix. + In-code comment clarification. Will merge to 'master'. - source: <20220718154322.2177166-1-martin.agren@gmail.com> + source: <6a14443c101fa132498297af6d7a483520688d75.1658488203.git.matheus.bernardino@usp.br> -* mb/config-document-include (2022-07-17) 1 commit - (merged to 'next' on 2022-07-19 at 8267b80aa2) - + config.txt: document include, includeIf +* mt/rot13-in-c (2022-07-24) 2 commits + - t/t0021: convert the rot13-filter.pl script to C + - Merge branch 'mt/checkout-count-fix' into mt/rot13-in-c + (this branch uses mt/checkout-count-fix.) - Add missing documentation for "include" and "includeIf" features in - "git config" file format, which incidentally teachs the command - line completion to include them in its offerings. + Test portability improvements. - Will merge to 'master'. - source: + Needs review. + source: -* sg/index-format-doc-update (2022-07-18) 1 commit - (merged to 'next' on 2022-07-19 at ccc384be5e) - + index-format.txt: remove outdated list of supported extensions +* tk/untracked-cache-with-uall (2022-07-22) 1 commit + (merged to 'next' on 2022-07-25 at b792dd5012) + + read-cache: make `do_read_index()` always set up `istate->repo` - Docfix. + Fix for a bug that makes write-tree to fail to write out a + non-existent index as a tree, introduced in 2.37. Will merge to 'master'. - source: <20220718085640.7395-1-szeder.dev@gmail.com> + source: <20220722212232.833188-1-martin.agren@gmail.com> -* tl/pack-bitmap-error-messages (2022-07-18) 6 commits - (merged to 'next' on 2022-07-19 at 3f9565653a) - + pack-bitmap.c: continue looping when first MIDX bitmap is found - + pack-bitmap.c: using error() instead of silently returning -1 - + pack-bitmap.c: do not ignore error when opening a bitmap file - + pack-bitmap.c: rename "idx_name" to "bitmap_name" - + pack-bitmap.c: mark more strings for translations - + pack-bitmap.c: fix formatting of error messages +* ds/midx-with-less-memory (2022-07-27) 4 commits + (merged to 'next' on 2022-07-27 at 9ac7aed9f6) + + write_midx_bitmap(): drop unused refs_snapshot parameter + (merged to 'next' on 2022-07-20 at 250d257c3e) + + midx: reduce memory pressure while writing bitmaps + + midx: extract bitmap write setup + + pack-bitmap-write: use const for hashes - Tweak various messages that come from the pack-bitmap codepaths. + The codepath to write multi-pack index has been taught to release a + large chunk of memory that holds an array of objects in the packs, + as soon as it is done with the array, to reduce memory consumption. Will merge to 'master'. - source: + source: * tl/trace2-config-scope (2022-07-22) 2 commits @@ -300,21 +511,11 @@ Release tarballs are available at: Tweak trace2 output about configuration variables. - Will merge to 'next'? + Expecting a reroll. + cf. <220722.86fsits91m.gmgdl@evledraar.gmail.com> source: -* vd/scalar-doc (2022-07-18) 2 commits - (merged to 'next' on 2022-07-20 at fab0234da4) - + scalar: convert README.md into a technical design doc - + scalar: reword command documentation to clarify purpose - - Doc update. - - Will merge to 'master'. - source: - - * cl/rerere-train-with-no-sign (2022-07-19) 1 commit (merged to 'next' on 2022-07-20 at fbb9414d09) + contrib/rerere-train: avoid useless gpg sign in training @@ -326,83 +527,42 @@ Release tarballs are available at: source: -* ds/win-syslog-compiler-fix (2022-07-19) 1 commit - (merged to 'next' on 2022-07-20 at d38b649b18) - + compat/win32: correct for incorrect compiler warning - - Workaround for a false positive compiler warning. - - Will merge to 'master'. - source: - - -* ld/osx-keychain-usage-fix (2022-07-19) 1 commit - (merged to 'next' on 2022-07-20 at eebd316ef6) - + osx-keychain: fix compiler warning - - Workaround for a compiler warning against use of die() in - osx-keychain (in contrib/). - - Will merge to 'master'. - source: - - -* ab/submodule-helper-leakfix (2022-07-21) 26 commits +* ab/submodule-helper-leakfix (2022-07-28) 18 commits - submodule--helper: fix a configure_added_submodule() leak - - submodule--helper: fix bad config API usage - submodule--helper: free rest of "displaypath" in "struct update_data" - - submodule--helper: don't exit() on failure, return - - submodule--helper: add skeleton "goto cleanup" to update_submodule() - - submodule--helper: rename "int res" to "int ret" - submodule--helper: free some "displaypath" in "struct update_data" - submodule--helper: fix a memory leak in print_status() - submodule--helper: fix a leak in module_add() - submodule--helper: fix obscure leak in module_add() - - submodule--helper: fix "reference" leak is "module_clone_data" + - submodule--helper: fix "reference" leak - submodule--helper: fix a memory leak in get_default_remote_submodule() - submodule--helper: fix a leak with repo_clear() - submodule--helper: fix "sm_path" and other "module_cb_list" leaks - submodule--helper: fix "errmsg_str" memory leak - - submodule--helper: refactor "errmsg_str" to be a "struct strbuf" - submodule--helper: add and use *_release() functions - - submodule--helper: add "const" to copy of "update_data" - submodule--helper: don't leak {run,capture}_command() cp.dir argument - submodule--helper: "struct pathspec" memory leak in module_update() - submodule--helper: fix most "struct pathspec" memory leaks - submodule--helper: fix trivial get_default_remote_submodule() leak - submodule--helper: fix a leak in "clone_submodule" - - submodule--helper: pass a "const struct module_clone_data" to clone_submodule() - - submodule--helper: stop conflating "sb" in clone_submodule() - - submodule--helper: replace memset() with { 0 }-initialization + - Merge branch 'ab/submodule-helper-prep' into ab/submodule-helper-leakfix + (this branch uses ab/submodule-helper-prep.) Plugging leaks in submodule--helper. Getting there. - source: - - -* mt/doc-config (2022-07-14) 3 commits - - doc: notes: unify configuration variables definitions - - doc: apply: unify configuration variables definitions - - doc: grep: unify configuration variables definitions - - Unify description of configuration variables used by individual - commands in the documentation of the commands and the documentation - of the "git config". - - Will discard (Retracted?). - cf. - source: + source: -* jt/fetch-pack-trace2-filter-spec (2022-07-18) 1 commit - - fetch-pack: write effective filter to trace2 +* jt/fetch-pack-trace2-filter-spec (2022-07-26) 1 commit + (merged to 'next' on 2022-07-28 at 8e6237d6b0) + + fetch-pack: write effective filter to trace2 "git fetch" client logs the partial clone filter used in the trace2 output. - Will merge to 'next'? - source: <20220718170027.3993042-1-jonathantanmy@google.com> + Will merge to 'master'. + source: <20220726162712.1774355-1-jonathantanmy@google.com> * mb/doc-rerere-autoupdate (2022-07-15) 1 commit @@ -411,50 +571,36 @@ Release tarballs are available at: Clarifies that the "--no-rerere-autoupdate" option does not disable the "rerere" mechanism (nor does "--rerere-autoupdate" enable it). - Will merge to 'next'? + Needs updating, at least for other commands with the same option. + cf. source: <20220715092527.1567837-1-mail@beyermatthias.de> * rs/mergesort (2022-07-17) 10 commits - - mergesort: remove llist_mergesort() - - packfile: use DEFINE_LIST_SORT - - fetch-pack: use DEFINE_LIST_SORT - - commit: use DEFINE_LIST_SORT - - blame: use DEFINE_LIST_SORT - - test-mergesort: use DEFINE_LIST_SORT - - test-mergesort: use DEFINE_LIST_SORT_DEBUG - - mergesort: add macros for typed sort of linked lists - - mergesort: tighten merge loop - - mergesort: unify ranks loops + (merged to 'next' on 2022-07-27 at 42607a44bb) + + mergesort: remove llist_mergesort() + + packfile: use DEFINE_LIST_SORT + + fetch-pack: use DEFINE_LIST_SORT + + commit: use DEFINE_LIST_SORT + + blame: use DEFINE_LIST_SORT + + test-mergesort: use DEFINE_LIST_SORT + + test-mergesort: use DEFINE_LIST_SORT_DEBUG + + mergesort: add macros for typed sort of linked lists + + mergesort: tighten merge loop + + mergesort: unify ranks loops Make our mergesort implementation type-safe. - Will merge to 'next'? + Will merge to 'master'. source: <4d7cd286-398e-215c-f2bd-aa7e8207be4f@web.de> -* cw/submodule-merge-messages (2022-07-18) 1 commit +* cw/submodule-merge-messages (2022-07-28) 1 commit - submodule merge: update conflict error message Update the message given when "git merge" sees conflicts at a path with a submodule while merging a superproject. - - Needs review. - source: <20220718214349.3379328-1-calvinwan@google.com> - - -* ds/doc-wo-whitelist (2022-07-19) 5 commits - (merged to 'next' on 2022-07-20 at ec51c6269a) - + transport.c: avoid "whitelist" - + t: avoid "whitelist" - + git.txt: remove redundant language - + git-cvsserver: clarify directory list - + daemon: clarify directory arguments - - Avoid "white/black-list" in documentation and code comments. - - Will merge to 'master'. - source: + source: <20220728211221.2913928-1-calvinwan@google.com> * mt/checkout-count-fix (2022-07-14) 3 commits @@ -472,14 +618,15 @@ Release tarballs are available at: * tb/commit-graph-genv2-upgrade-fix (2022-07-15) 3 commits - - commit-graph: fix corrupt upgrade from generation v1 to v2 - - commit-graph: introduce `repo_find_commit_pos_in_graph()` - - t5318: demonstrate commit-graph generation v2 corruption + (merged to 'next' on 2022-07-25 at e3464c2c1d) + + commit-graph: fix corrupt upgrade from generation v1 to v2 + + commit-graph: introduce `repo_find_commit_pos_in_graph()` + + t5318: demonstrate commit-graph generation v2 corruption There was a bug in the codepath to upgrade generation information in commit-graph from v1 to v2 format, which has been corrected. - Will merge to 'next'? + Will merge to 'master'. source: @@ -488,7 +635,8 @@ Release tarballs are available at: - mingw: handle a file owned by the Administrators group correctly - Allow debugging unsafe directories' ownership - Needs review. + Expecting a reroll. + cf. <8rqqnqp1-q613-ron6-6q8s-n7sq57o980q9@tzk.qr> source: @@ -526,9 +674,9 @@ Release tarballs are available at: The pack bitmap file gained a bitmap-lookup table to speed up locating the necessary bitmap for a given commit. - Waiting for a more thorough review. - cf. - source: + Seems to be flaky-broken under SHA-256. + cf. + source: * kk/p4-client-name-encoding-fix (2022-07-21) 2 commits @@ -545,15 +693,16 @@ Release tarballs are available at: * sa/cat-file-mailmap (2022-07-18) 4 commits - - cat-file: add mailmap support - - ident: rename commit_rewrite_person() to apply_mailmap_to_header() - - ident: move commit_rewrite_person() to ident.c - - revision: improve commit_rewrite_person() + (merged to 'next' on 2022-07-27 at 59c4eb32b3) + + cat-file: add mailmap support + + ident: rename commit_rewrite_person() to apply_mailmap_to_header() + + ident: move commit_rewrite_person() to ident.c + + revision: improve commit_rewrite_person() "git cat-file" learned an option to use the mailmap when showing commit and tag objects. - Will merge to 'next'? + Will merge to 'master'. source: <20220718195102.66321-1-siddharthasthana31@gmail.com> @@ -581,62 +730,46 @@ Release tarballs are available at: * pw/xdiff-alloc (2022-07-08) 4 commits - - xdiff: introduce XDL_ALLOC_GROW() - - xdiff: introduce XDL_CALLOC_ARRAY() - - xdiff: introduce xdl_calloc - - xdiff: introduce XDL_ALLOC_ARRAY() + (merged to 'next' on 2022-07-25 at 92a39a5ff2) + + xdiff: introduce XDL_ALLOC_GROW() + + xdiff: introduce XDL_CALLOC_ARRAY() + + xdiff: introduce xdl_calloc + + xdiff: introduce XDL_ALLOC_ARRAY() Add a level of redirection to array allocation API in xdiff part, to make it easier to share with the libgit2 project. - Will merge to 'next'? - source: - - -* ab/squelch-empty-fsync-traces (2022-07-18) 1 commit - (merged to 'next' on 2022-07-19 at f77cd40c29) - + trace2: only include "fsync" events if we git_fsync() - - Omit fsync-related trace2 entries when their values are all zero. - Will merge to 'master'. - source: + source: -* en/merge-restore-to-pristine (2022-07-21) 7 commits - - merge: do not exit restore_state() prematurely - - merge: ensure we can actually restore pre-merge state - - merge: make restore_state() restore staged state too - - merge: fix save_state() to work when there are stat-dirty files - - merge: do not abort early if one strategy fails to handle the merge - - merge-resolve: abort if index does not match HEAD - - merge-ort-wrappers: make printed message match the one from recursive +* en/merge-restore-to-pristine (2022-07-22) 8 commits + (merged to 'next' on 2022-07-27 at daafc50c15) + + merge: do not exit restore_state() prematurely + + merge: ensure we can actually restore pre-merge state + + merge: make restore_state() restore staged state too + + merge: fix save_state() to work when there are stat-dirty files + + merge: do not abort early if one strategy fails to handle the merge + + merge: abort if index does not match HEAD for trivial merges + + merge-resolve: abort if index does not match HEAD + + merge-ort-wrappers: make printed message match the one from recursive When "git merge" finds that it cannot perform a merge, it should restore the working tree to the state before the command was initiated, but in some corner cases it didn't. - Will merge to 'next'? - source: + Will merge to 'master'. + source: -* zh/ls-files-format (2022-07-20) 1 commit - - ls-files: introduce "--format" option +* zh/ls-files-format (2022-07-23) 1 commit + (merged to 'next' on 2022-07-27 at b7301f16ce) + + ls-files: introduce "--format" option "git ls-files" learns the "--format" option to tweak its output. - Will merge to 'next'? - source: - - -* js/commit-graph-parsing-without-repo-settings (2022-07-14) 1 commit - (merged to 'next' on 2022-07-19 at bcc29d823d) - + commit-graph: pass repo_settings instead of repository - - API tweak to make it easier to run fuzz testing on commit-graph parser. - Will merge to 'master'. - source: + source: * jt/connected-show-missing-from-which-side (2022-06-10) 1 commit @@ -664,18 +797,14 @@ Release tarballs are available at: source: -* ds/bundle-uri-more (2022-06-06) 6 commits - - fetch: add 'refs/bundle/' to log.excludeDecoration - - bundle-uri: add support for http(s):// and file:// - - fetch: add --bundle-uri option - - bundle-uri: create basic file-copy logic - - remote-curl: add 'get' capability +* ds/bundle-uri-more (2022-07-25) 2 commits + - bundle-uri: add example bundle organization - docs: document bundle URI standard The "bundle URI" topic. Needs review. - source: + source: * js/bisect-in-c (2022-06-27) 16 commits @@ -716,3 +845,17 @@ Release tarballs are available at: myself for daily work, but the prompting turned out to be somewhat distracting. source: <20220422083629.1404989-1-hi@alyssa.is> + + +* mt/doc-config (2022-07-14) 3 commits + . doc: notes: unify configuration variables definitions + . doc: apply: unify configuration variables definitions + . doc: grep: unify configuration variables definitions + + Unify description of configuration variables used by individual + commands in the documentation of the commands and the documentation + of the "git config". + + Retracted. + cf. <20220723134834.9693-1-matheus.bernardino@usp.br> + source: