From: Junio C Hamano Date: Thu, 1 Aug 2024 21:00:29 +0000 (-0700) Subject: What's cooking (2024/08 #01) X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5d775b5a86ec6cad3b8e6024cd457b84ebdbd97e;p=thirdparty%2Fgit.git What's cooking (2024/08 #01) --- diff --git a/whats-cooking.txt b/whats-cooking.txt index 0a8dc7f069..bbafb70c65 100644 --- a/whats-cooking.txt +++ b/whats-cooking.txt @@ -1,10 +1,10 @@ To: git@vger.kernel.org -Subject: What's cooking in git.git (Jul 2024, #09; Mon, 29) -X-master-at: 39bf06adf96da25b87c9aa7d35a32ef3683eb4a4 -X-next-at: 1c80b25241079052bdf3727e0ab9a5d77c51ea6e +Subject: What's cooking in git.git (Aug 2024, #01; Thu, 1) +X-master-at: 406f326d271e0bacecdb00425422c5fa3f314930 +X-next-at: e559c4bf1a306cf5814418d318cc0fea070da3c7 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Jul 2024, #09; Mon, 29) +What's cooking in git.git (Aug 2024, #01; Thu, 1) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -17,16 +17,8 @@ topic without enough support may be discarded after a long period of no activity (of course they can be resubmit when new interests arise). -Git 2.46 has been tagged. As usual, we'll wait for embarrassing -bugs to be reported for a week or so, try to fix them, and then -reopen the tree for the next iteration (probably called 2.47). - -We already have known fallouts left from the removal of fallback to -SHA-1 in operations that do not require an repository, which we may -want to address next. There may be more work needed to alleviate -the issues caused by the over-eager defense-in-depth changes -introduced by 2.45.1, even though they were somewhat loosened in -2.45.2 already. +The first two batches of topics have graduated to 'master' and +'next' has been rewound on top of 'master'. 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 @@ -57,51 +49,56 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[New Topics] - -* ja/doc-synopsis-markup (2024-07-24) 3 commits - - doc: apply synopsis simplification on git-clone and git-init - - doc: update the guidelines to reflect the current formatting rules - - doc: introduce a synopsis custom paragraph attribute +[Graduated to 'master'] - The way AsciiDoc is used for SYNOPSIS part of the manual pages has - been revamped. The sources, at least for the simple cases, got - vastly pleasant to work with. +* ad/merge-with-diff-algorithm (2024-07-13) 1 commit + (merged to 'next' on 2024-07-16 at 90fe5aff4d) + + merge-recursive: honor diff.algorithm - Inviting further discussion. - source: + Many Porcelain commands that internally use the merge machinery + were taught to consistently honor the diff.algorithm configuration. + source: -* ps/doc-more-c-coding-guidelines (2024-07-24) 3 commits - - Documentation: document difference between release and free - - Documentation: document naming schema for struct-related functions - - Documentation: clarify indentation style for C preprocessor directives +* as/show-ref-option-help-update (2024-07-25) 1 commit + (merged to 'next' on 2024-07-26 at bbdc971c38) + + show-ref: improve short help messages of options - Some project conventions have been added to CodingGuidelines. + A few descriptions in "git show-ref -h" have been clarified. + source: <20240724111116.91615-1-ash@kambanaria.org> - Inviting further discussion. - source: +* cp/unit-test-reftable-merged (2024-07-12) 7 commits + (merged to 'next' on 2024-07-23 at 88d2a9ee28) + + t-reftable-merged: add test for REFTABLE_FORMAT_ERROR + + t-reftable-merged: use reftable_ref_record_equal to compare ref records + + t-reftable-merged: add tests for reftable_merged_table_max_update_index + + t-reftable-merged: improve the const-correctness of helper functions + + t-reftable-merged: improve the test t_merged_single_record() + + t: harmonize t-reftable-merged.c with coding guidelines + + t: move reftable/merged_test.c to the unit testing framework -* tc/fetch-bundle-uri (2024-07-24) 3 commits - - fetch: use bundle URIs when having creationToken heuristic - - transport: introduce transport_has_remote_bundle_uri() - - clone: remove double bundle list clear code + Another reftable test has been ported to use the unit test framework. + source: <20240712055041.6476-1-chandrapratap3519@gmail.com> - Allow "git fetch" take advantage of bundleURI feature. - Needs review. - source: <20240724144957.3033840-1-toon@iotcl.com> +* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit + (merged to 'next' on 2024-07-22 at 9573259db9) + + checkout: special case error messages during noop switching + "git checkout --ours" (no other arguments) complained that the + option is incompatible with branch switching, which is technically + correct, but found confusing by some users. It now says that the + user needs to give pathspec to specify what paths to checkout. + source: -* as/show-ref-option-help-update (2024-07-25) 1 commit - (merged to 'next' on 2024-07-26 at bbdc971c38) - + show-ref: improve short help messages of options - A few descriptions in "git show-ref -h" have been clarified. +* jc/doc-one-shot-export-with-shell-func (2024-07-23) 1 commit + (merged to 'next' on 2024-07-23 at 621c29e4f6) + + CodingGuidelines: document a shell that "fails" "VAR=VAL shell_func" - Will merge to 'master'. - source: <20240724111116.91615-1-ash@kambanaria.org> + It has been documented that we avoid "VAR=VAL shell_func" and why. + source: * jc/doc-rebase-fuzz-vs-offset-fix (2024-07-25) 1 commit @@ -111,8 +108,6 @@ Release tarballs are available at: "git rebase --help" referred to "offset" (the difference between the location a change was taken from and the change gets replaced) incorrectly and called it "fuzz", which has been corrected. - - Will merge to 'master'. source: @@ -122,92 +117,309 @@ Release tarballs are available at: The reviewing guidelines document now explicitly encourages people to give positive reviews and how. + source: + + +* jc/how-to-maintain-updates (2024-07-19) 2 commits + (merged to 'next' on 2024-07-26 at c950efa46d) + + howto-maintain: update daily tasks + + howto-maintain: cover a whole development cycle + + Doc update. + source: + + +* jt/doc-post-receive-hook-update (2024-07-15) 1 commit + (merged to 'next' on 2024-07-17 at 624ac4ebe2) + + doc: clarify post-receive hook behavior + + Doc update. + source: <20240715183739.7808-1-jltobler@gmail.com> + + +* kn/ci-clang-format (2024-07-23) 6 commits + (merged to 'next' on 2024-07-23 at 3aca45d08a) + + ci/style-check: add `RemoveBracesLLVM` in CI job + + check-whitespace: detect if no base_commit is provided + + ci: run style check on GitHub and GitLab + + clang-format: formalize some of the spacing rules + + clang-format: avoid spacing around bitfield colon + + clang-format: indent preprocessor directives after hash + (this branch is used by ps/doc-more-c-coding-guidelines.) + + A CI job that use clang-format to check coding style issues in new + code has been added. + source: <20240723082111.874382-1-karthik.188@gmail.com> + + +* pw/add-patch-with-suppress-blank-empty (2024-07-20) 2 commits + (merged to 'next' on 2024-07-22 at 5437b7dee3) + + add-patch: use normalize_marker() when recounting edited hunk + + add-patch: handle splitting hunks with diff.suppressBlankEmpty + + "git add -p" by users with diff.suppressBlankEmpty set to true + failed to parse the patch that represents an unmodified empty line + with an empty line (not a line with a single space on it), which + has been corrected. + source: + + +* rj/make-cleanup (2024-07-18) 2 commits + (merged to 'next' on 2024-07-22 at bf3991f70f) + + config.mak.uname: remove unused uname_P variable + + Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS + + A build tweak knob has been simplified by not setting the value + that is already the default; another unused one has been removed. + source: <0d132370-3e07-4332-bcfb-c4450100d736@ramsayjones.plus.com> + + +* rs/t-strvec-use-test-msg (2024-07-16) 3 commits + (merged to 'next' on 2024-07-16 at 3e860b3f12) + + t-strvec: fix type mismatch in check_strvec + (merged to 'next' on 2024-07-15 at f26e434515) + + t-strvec: improve check_strvec() output + (merged to 'next' on 2024-07-08 at c28c2553de) + + t-strvec: use test_msg() + + Unit test clean-up. + source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de> + source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de> + source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de> + + +* tn/doc-commit-fix (2024-07-22) 1 commit + (merged to 'next' on 2024-07-23 at eb73e04ee4) + + doc: remove dangling closing parenthesis + + Docfix. + source: <20240722225302.124356-1-tomasn@posteo.net> + +-------------------------------------------------- +[New Topics] + +* dd/notes-empty-no-edit-by-default (2024-07-29) 1 commit + (merged to 'next' on 2024-08-01 at fe75c53260) + + notes: do not trigger editor when adding an empty note + + "git notes add -m '' --allow-empty" and friends that take prepared + data to create notes should not invoke an editor, but it started + doing so since Git 2.42, which has been corrected. Will merge to 'master'. - source: + source: <20240729151639.19192-2-ddiss@suse.de> -* jc/leakfix-hashfile (2024-07-26) 1 commit - - csum-file: introduce discard_hashfile() +* ks/unit-test-comment-typofix (2024-07-29) 1 commit + (merged to 'next' on 2024-08-01 at 35c44187b1) + + unit-tests/test-lib: fix typo in check_pointer_eq() description - source: + Typofix. + Will merge to 'master'. + source: <20240729043303.3486-1-five231003@gmail.com> -* jc/leakfix-mailmap (2024-07-26) 1 commit - - mailmap: plug memory leak in read_mailmap_blob() - source: +* dh/encoding-trace-optim (2024-07-31) 1 commit + (merged to 'next' on 2024-08-01 at c5e023eeaf) + + convert: return early when not tracing + An expensive operation to prepare tracing was done in re-encoding + code path even when the tracing was not requested, which has been + corrected. -* jr/ls-files-expand-literal-doc (2024-07-26) 1 commit - - doc: fix hex code escapes in git-ls-files + Will merge to 'master'. + source: - source: +* ps/refs-wo-the-repository (2024-07-30) 5 commits + - refs/reftable: stop using `the_repository` + - refs/packed: stop using `the_repository` + - refs/files: stop using `the_repository` + - refs/files: stop using `the_repository` in `parse_loose_ref_contents()` + - refs: stop using `the_repository` -* ps/leakfixes-part-3 (2024-07-26) 23 commits - - commit-reach: fix trivial memory leak when computing reachability - - convert: fix leaking config strings - - entry: fix leaking pathnames during delayed checkout - - object-name: fix leaking commit list items - - t/test-repository: fix leaking repository - - builtin/credential-cache: fix trivial leaks - - builtin/worktree: fix leaking derived branch names - - builtin/shortlog: fix various trivial memory leaks - - builtin/rerere: fix various trivial memory leaks - - builtin/credential-store: fix leaking credential - - builtin/show-branch: fix several memory leaks - - builtin/rev-parse: fix memory leak with `--parseopt` - - builtin/stash: fix various trivial memory leaks - - builtin/remote: fix various trivial memory leaks - - builtin/remote: fix leaking strings in `branch_list` - - builtin/ls-remote: fix leaking `pattern` strings - - builtin/submodule--helper: fix various trivial memory leaks - - builtin/name-rev: fix various trivial memory leaks - - builtin/describe: fix trivial memory leak when describing blob - - builtin/describe: fix leaking array when running diff-index - - builtin/describe: fix memory leak with `--contains=` - - builtin/log: fix leaking branch name when creating cover letters - - builtin/replay: plug leaking `advance_name` variable + In the refs subsystem, implicit reliance of the_repository has been + eliminated; the repository associated with the ref store object is + used instead. + + Will merge to 'next'? + cf. + source: + + +* rs/grep-omit-blank-lines-after-function-at-eof (2024-07-30) 1 commit + (merged to 'next' on 2024-08-01 at 0c6e2b21f9) + + grep: -W: skip trailing empty lines at EOF, too - source: + "git grep -W" omits blank lines that follow the found function at + the end of the file, just like it omits blank lines before the next + function. + + Will merge to 'master'. + source: <8b90e0ec-251f-46b3-8777-96efd58e227b@web.de> + + +* rs/t-example-simplify (2024-07-30) 1 commit + - t-example-decorate: remove test messages + + Unit test simplification. + + Will merge to 'next'? + source: <5c838884-b606-465a-8f7e-ab760ddadef8@web.de> + + +* cc/promisor-remote-capability (2024-07-31) 4 commits + - promisor-remote: check advertised name or URL + - Add 'promisor-remote' capability to protocol v2 + - strbuf: refactor strbuf_trim_trailing_ch() + - version: refactor strbuf_sanitize() + + The v2 protocol learned to allow the server to advertise possible + promisor remotes, and the client to respond with what promissor + remotes it uses, so that the server side can omit objects that the + client can lazily obtain from these other promissor remotes. + + Inviting further discussion. + source: <20240731134014.2299361-1-christian.couder@gmail.com> + + +* ps/reftable-stack-compaction (2024-07-31) 8 commits + - reftable/stack: handle locked tables during auto-compaction + - reftable/stack: fix corruption on concurrent compaction + - reftable/stack: use lock_file when adding table to "tables.list" + - reftable/stack: do not die when fsyncing lock file files + - reftable/stack: simplify tracking of table locks + - reftable/stack: update stats on failed full compaction + - reftable/stack: test compaction with already-locked tables + - reftable/stack: refactor function to gather table sizes + + The code paths to compact multiple reftable files have been updated + to correctly deal with multiple compaction triggering at the same + time. + + Needs review. + source: + + +* rh/http-proxy-path (2024-08-01) 1 commit + - http: do not ignore proxy path + + The value of http.proxy can have "path" at the end for a socks + proxy that listens to a unix-domain socket, but we started to + discard it when we taught proxy auth code path to use the + credential helpers, which has been corrected. + + Will merge to 'next'. + source: + + +* jc/refs-symref-referent (2024-08-01) 4 commits + - SQUASH??? + - ref-filter: populate symref from iterator + - refs: add referent to each_ref_fn + - refs: keep track of unresolved reference value in iterators + + The refs API has been taught to give symref target information to + the users of ref iterators, allowing for-each-ref and friends to + avoid an extra ref_resolve_* API call per a symbolic ref. + + Inviting further discussion. + source: + + +* jk/osxkeychain-username-is-nul-terminated (2024-08-01) 1 commit + - credential/osxkeychain: respect NUL terminator in username + + The credential helper to talk to OSX keychain sometimes sent + garbage bytes after the username, which has been corrected. + + Will merge to 'next'. + source: <20240801082556.GA640360@coredump.intra.peff.net> + + +* tb/config-fixed-value-with-valueless-true (2024-08-01) 1 commit + - config.c: avoid segfault with --fixed-value and valueless config + + "git config --value=foo --fixed-value section.key newvalue" barfed + when the existing value in the configuration file used the + valueless true syntax, which has been corrected. + + Will merge to 'next'. + source: + + +* jc/jl-git-no-advice-fix (2024-08-01) 1 commit + - t0018: remove leftover debugging cruft + + Remove leftover debugging cruft from a test script. + + Will merge to 'next'. + source: -------------------------------------------------- [Stalled] -* sj/ref-fsck (2024-07-15) 10 commits - - fsck: add ref content check for files backend - - fsck: add ref name check for files backend - - files-backend: add unified interface for refs scanning - - builtin/fsck: add `git-refs verify` child process - - git refs: add verify subcommand - - refs: set up ref consistency check infrastructure - - fsck: add refs-related error report function - - fsck: rename objects-related fsck error functions - - fsck: add a unified interface for reporting fsck messages - - fsck: rename "skiplist" to "skip_oids" +* sj/ref-fsck (2024-07-30) 10 commits + . fsck: add ref content check for files backend + . fsck: add ref name check for files backend + . files-backend: add unified interface for refs scanning + . builtin/fsck: add `git-refs verify` child process + . git refs: add verify subcommand + . refs: set up ref consistency check infrastructure + . fsck: add refs-related error report function + . fsck: rename objects-related fsck error functions + . fsck: add a unified interface for reporting fsck messages + . fsck: rename "skiplist" to "skip_oids" "git fsck" infrastructure has been taught to also check the sanity of the ref database, in addition to the object database. - Needs review. - source: + Needs update. + Contradicts with Patrick's the_repository elimination series. + source: + + +* pp/add-parse-range-unit-test (2024-05-27) 1 commit + - apply: add unit tests for parse_range + + A unit test for code that parses the hunk offset and length from a + patch fragment header as been added. + Expecting a reroll. + cf. + source: + + +* cw/git-std-lib (2024-02-28) 4 commits + . SQUASH??? get rid of apparent debugging crufts + . test-stdlib: show that git-std-lib is independent + . git-std-lib: introduce Git Standard Library + . pager: include stdint.h because uintmax_t is used -* cp/unit-test-reftable-pq (2024-07-23) 7 commits + Split libgit.a out to a separate git-std-lib tor easier reuse. + + Expecting a reroll. + source: + +-------------------------------------------------- +[Cooking] + +* cp/unit-test-reftable-pq (2024-08-01) 7 commits - t-reftable-pq: add tests for merged_iter_pqueue_top() - t-reftable-pq: add test for index based comparison - t-reftable-pq: make merged_iter_pqueue_check() callable by reference - t-reftable-pq: make merged_iter_pqueue_check() static - t: move reftable/pq_test.c to the unit testing framework - reftable: change the type of array indices to 'size_t' in reftable/pq.c - - reftable: remove unncessary curly braces in reftable/pq.c + - reftable: remove unnecessary curly braces in reftable/pq.c The tests for "pq" part of reftable library got rewritten to use the unit test framework. - Needs review. - source: <20240723143032.4261-1-chandrapratap3519@gmail.com> + Will merge to 'next'. + cf. + source: <20240801110453.5087-1-chandrapratap3519@gmail.com> * tb/incremental-midx-part-1 (2024-07-17) 19 commits @@ -233,54 +445,112 @@ Release tarballs are available at: Incremental updates of multi-pack index files. - Needs review. + Expecting a reroll. + cf. source: -* pp/add-parse-range-unit-test (2024-05-27) 1 commit - - apply: add unit tests for parse_range +* ja/doc-synopsis-markup (2024-07-24) 3 commits + - doc: apply synopsis simplification on git-clone and git-init + - doc: update the guidelines to reflect the current formatting rules + - doc: introduce a synopsis custom paragraph attribute - A unit test for code that parses the hunk offset and length from a - patch fragment header as been added. + The way AsciiDoc is used for SYNOPSIS part of the manual pages has + been revamped. The sources, at least for the simple cases, got + vastly pleasant to work with. - Expecting a reroll. - cf. - source: + Inviting further discussion. + source: -* cw/git-std-lib (2024-02-28) 4 commits - . SQUASH??? get rid of apparent debugging crufts - . test-stdlib: show that git-std-lib is independent - . git-std-lib: introduce Git Standard Library - . pager: include stdint.h because uintmax_t is used +* ps/doc-more-c-coding-guidelines (2024-07-30) 6 commits + (merged to 'next' on 2024-08-01 at 8f8ac5d6ca) + + Documentation: consistently use spaces inside initializers + + Documentation: document idiomatic function names + + Documentation: document naming schema for structs and their functions + + Documentation: clarify indentation style for C preprocessor directives + + clang-format: fix indentation width for preprocessor directives + + Merge branch 'kn/ci-clang-format' into ps/doc-more-c-coding-guidelines - Split libgit.a out to a separate git-std-lib tor easier reuse. + Some project conventions have been added to CodingGuidelines. - Expecting a reroll. - source: + Will merge to 'master'. + source: --------------------------------------------------- -[Cooking] -* ps/p4-tests-updates (2024-07-23) 3 commits - - t98xx: mark Perforce tests as memory-leak free - - ci: update Perforce version to r23.2 - - t98xx: fix Perforce tests with p4d r23 and newer +* tc/fetch-bundle-uri (2024-07-24) 3 commits + - fetch: use bundle URIs when having creationToken heuristic + - transport: introduce transport_has_remote_bundle_uri() + - clone: remove double bundle list clear code - Perforce tests have been updated. + Allow "git fetch" take advantage of bundleURI feature. Needs review. - source: + source: <20240724144957.3033840-1-toon@iotcl.com> -* jc/doc-one-shot-export-with-shell-func (2024-07-23) 1 commit - (merged to 'next' on 2024-07-23 at 621c29e4f6) - + CodingGuidelines: document a shell that "fails" "VAR=VAL shell_func" +* jc/leakfix-hashfile (2024-07-26) 1 commit + - csum-file: introduce discard_hashfile() + + source: + + +* jc/leakfix-mailmap (2024-07-26) 1 commit + - mailmap: plug memory leak in read_mailmap_blob() + + source: - It has been documented that we avoid "VAR=VAL shell_func" and why. + +* jr/ls-files-expand-literal-doc (2024-07-26) 1 commit + - doc: fix hex code escapes in git-ls-files + + source: + + +* ps/leakfixes-part-3 (2024-08-01) 24 commits + - commit-reach: fix trivial memory leak when computing reachability + - convert: fix leaking config strings + - entry: fix leaking pathnames during delayed checkout + - object-name: fix leaking commit list items + - t/test-repository: fix leaking repository + - builtin/credential-cache: fix trivial leaks + - builtin/worktree: fix leaking derived branch names + - builtin/shortlog: fix various trivial memory leaks + - builtin/rerere: fix various trivial memory leaks + - builtin/credential-store: fix leaking credential + - builtin/show-branch: fix several memory leaks + - builtin/rev-parse: fix memory leak with `--parseopt` + - builtin/stash: fix various trivial memory leaks + - builtin/remote: fix various trivial memory leaks + - builtin/remote: fix leaking strings in `branch_list` + - builtin/ls-remote: fix leaking `pattern` strings + - builtin/submodule--helper: fix leaking buffer in `is_tip_reachable` + - builtin/submodule--helper: fix leaking clone depth parameter + - builtin/name-rev: fix various trivial memory leaks + - builtin/describe: fix trivial memory leak when describing blob + - builtin/describe: fix leaking array when running diff-index + - builtin/describe: fix memory leak with `--contains=` + - builtin/log: fix leaking branch name when creating cover letters + - builtin/replay: plug leaking `advance_name` variable + + More leakfixes. + + Will merge to 'next'. + cf. + source: + + +* ps/p4-tests-updates (2024-07-31) 3 commits + (merged to 'next' on 2024-08-01 at e559c4bf1a) + + t98xx: mark Perforce tests as memory-leak free + + ci: update Perforce version to r23.2 + + t98xx: fix Perforce tests with p4d r23 and newer + + Perforce tests have been updated. Will merge to 'master'. - source: + cf. + source: * ag/git-svn-global-ignores (2024-07-18) 2 commits @@ -290,69 +560,36 @@ Release tarballs are available at: "git svn" has been taught about svn:global-ignores property recent versions of Subversion has. - Needs review. + Will merge to 'next'? source: -* jc/how-to-maintain-updates (2024-07-19) 2 commits - (merged to 'next' on 2024-07-26 at c950efa46d) - + howto-maintain: update daily tasks - + howto-maintain: cover a whole development cycle - - Doc update. - - Will merge to 'master'. - source: - - * es/shell-check-updates (2024-07-26) 5 commits - - check-non-portable-shell: improve `VAR=val shell-func` detection - - check-non-portable-shell: suggest alternative for `VAR=val shell-func` - - check-non-portable-shell: loosen one-shot assignment error message - - t4034: fix use of one-shot variable assignment with shell function - - t3430: drop unnecessary one-shot "VAR=val shell-func" invocation + (merged to 'next' on 2024-08-01 at cf06aced6d) + + check-non-portable-shell: improve `VAR=val shell-func` detection + + check-non-portable-shell: suggest alternative for `VAR=val shell-func` + + check-non-portable-shell: loosen one-shot assignment error message + + t4034: fix use of one-shot variable assignment with shell function + + t3430: drop unnecessary one-shot "VAR=val shell-func" invocation Test script linter has been updated to catch an attempt to use one-shot export construct "VAR=VAL func" for shell functions (which does not work for some shells) better. - Will merge to 'next'. + Will merge to 'master'. source: <20240727053509.34339-1-ericsunshine@charter.net> -* jc/safe-directory (2024-07-22) 3 commits +* jc/safe-directory (2024-07-30) 4 commits - safe.directory: setting safe.directory="." allows the "current" directory - safe.directory: normalize the configured path - safe.directory: normalize the checked path + - safe.directory: preliminary clean-up Follow-up on 2.45.1 regression fix. - Needs review. - source: <20240723021900.388020-1-gitster@pobox.com> - - -* pw/add-patch-with-suppress-blank-empty (2024-07-20) 2 commits - (merged to 'next' on 2024-07-22 at 5437b7dee3) - + add-patch: use normalize_marker() when recounting edited hunk - + add-patch: handle splitting hunks with diff.suppressBlankEmpty - - "git add -p" by users with diff.suppressBlankEmpty set to true - failed to parse the patch that represents an unmodified empty line - with an empty line (not a line with a single space on it), which - has been corrected. - - Will merge to 'master'. - source: - - -* tn/doc-commit-fix (2024-07-22) 1 commit - (merged to 'next' on 2024-07-23 at eb73e04ee4) - + doc: remove dangling closing parenthesis - - Docfix. - - Will merge to 'master'. - source: <20240722225302.124356-1-tomasn@posteo.net> + Will merge to 'next'. + source: <20240730184352.2503276-1-gitster@pobox.com> * cp/unit-test-reftable-tree (2024-07-22) 5 commits @@ -369,18 +606,6 @@ Release tarballs are available at: source: <20240722061836.4176-1-chandrapratap3519@gmail.com> -* rj/make-cleanup (2024-07-18) 2 commits - (merged to 'next' on 2024-07-22 at bf3991f70f) - + config.mak.uname: remove unused uname_P variable - + Makefile: drop -Wno-universal-initializer from SP_EXTRA_FLAGS - - A build tweak knob has been simplified by not setting the value - that is already the default; another unused one has been removed. - - Will merge to 'master'. - source: <0d132370-3e07-4332-bcfb-c4450100d736@ramsayjones.plus.com> - - * ew/cat-file-optim (2024-07-15) 10 commits - cat-file: use writev(2) if available - cat-file: batch_write: use size_t for length @@ -408,16 +633,6 @@ Release tarballs are available at: source: -* jt/doc-post-receive-hook-update (2024-07-15) 1 commit - (merged to 'next' on 2024-07-17 at 624ac4ebe2) - + doc: clarify post-receive hook behavior - - Doc update. - - Will merge to 'master'. - source: <20240715183739.7808-1-jltobler@gmail.com> - - * jc/reflog-expire-lookup-commit-fix (2024-07-16) 1 commit - Revert "reflog expire: don't use lookup_commit_reference_gently()" @@ -428,128 +643,57 @@ Release tarballs are available at: source: -* es/doc-platform-support-policy (2024-07-18) 2 commits - - SQUASH??? +* es/doc-platform-support-policy (2024-07-30) 1 commit - Documentation: add platform support policy A policy document that describes platform support levels and expectation on platform stakeholders has been introduced. - source: <20240718173843.2411415-1-emilyshaffer@google.com> - - -* kn/ci-clang-format (2024-07-23) 6 commits - (merged to 'next' on 2024-07-23 at 3aca45d08a) - + ci/style-check: add `RemoveBracesLLVM` in CI job - + check-whitespace: detect if no base_commit is provided - + ci: run style check on GitHub and GitLab - + clang-format: formalize some of the spacing rules - + clang-format: avoid spacing around bitfield colon - + clang-format: indent preprocessor directives after hash - - A CI job that use clang-format to check coding style issues in new - code has been added. - Will merge to 'master'. - source: <20240723082111.874382-1-karthik.188@gmail.com> + Inviding further discussion. + source: <20240730175448.1727373-1-emilyshaffer@google.com> * rj/add-p-pager (2024-07-25) 4 commits - - add-patch: render hunks through the pager - - pager: introduce wait_for_pager - - pager: do not close fd 2 unnecessarily - - add-patch: test for 'p' command + (merged to 'next' on 2024-08-01 at 6f66ace52d) + + add-patch: render hunks through the pager + + pager: introduce wait_for_pager + + pager: do not close fd 2 unnecessarily + + add-patch: test for 'p' command A 'P' command to "git add -p" that passes the patch hunk to the pager has been added. - Will merge to 'next'. - source: <76936fb1-446d-455f-b4e7-6e24dda3c17d@gmail.com> - - -* ad/merge-with-diff-algorithm (2024-07-13) 1 commit - (merged to 'next' on 2024-07-16 at 90fe5aff4d) - + merge-recursive: honor diff.algorithm - - Many Porcelain commands that internally use the merge machinery - were taught to consistently honor the diff.algorithm configuration. - - Will merge to 'master'. - source: - - -* jc/checkout-no-op-switch-errors (2024-07-02) 1 commit - (merged to 'next' on 2024-07-22 at 9573259db9) - + checkout: special case error messages during noop switching - - "git checkout --ours" (no other arguments) complained that the - option is incompatible with branch switching, which is technically - correct, but found confusing by some users. It now says that the - user needs to give pathspec to specify what paths to checkout. - - Will merge to 'master'. - source: - - -* cp/unit-test-reftable-merged (2024-07-12) 7 commits - (merged to 'next' on 2024-07-23 at 88d2a9ee28) - + t-reftable-merged: add test for REFTABLE_FORMAT_ERROR - + t-reftable-merged: use reftable_ref_record_equal to compare ref records - + t-reftable-merged: add tests for reftable_merged_table_max_update_index - + t-reftable-merged: improve the const-correctness of helper functions - + t-reftable-merged: improve the test t_merged_single_record() - + t: harmonize t-reftable-merged.c with coding guidelines - + t: move reftable/merged_test.c to the unit testing framework - - Another reftable test has been ported to use the unit test framework. - - Will merge to 'master'. - source: <20240712055041.6476-1-chandrapratap3519@gmail.com> - - -* rs/t-strvec-use-test-msg (2024-07-16) 3 commits - (merged to 'next' on 2024-07-16 at 3e860b3f12) - + t-strvec: fix type mismatch in check_strvec - (merged to 'next' on 2024-07-15 at f26e434515) - + t-strvec: improve check_strvec() output - (merged to 'next' on 2024-07-08 at c28c2553de) - + t-strvec: use test_msg() - - Unit test clean-up. - Will merge to 'master'. - source: <35b0ba6b-d485-44f2-a19f-3ce816f8b435@web.de> - source: <983be396-f47c-4573-8c33-af8367f8ddbe@web.de> - source: <1521ed89-989e-452b-b7fc-9e73672e0764@web.de> + source: <76936fb1-446d-455f-b4e7-6e24dda3c17d@gmail.com> -* gt/unit-test-hashmap (2024-07-12) 1 commit +* gt/unit-test-hashmap (2024-07-30) 1 commit - t: port helper/test-hashmap.c to unit-tests/t-hashmap.c An existing test of hashmap API has been rewritten with the unit-test framework. What's the doneness of this one? - source: <20240711235159.5320-1-shyamthakkar001@gmail.com> + source: <20240730115101.188100-1-author@example.com> -* rs/unit-tests-test-run (2024-07-24) 7 commits - - t-strbuf: use for_test - - t-strvec: use for_test - - t-reftable-basics: use for_test - - t-ctype: use for_test - - unit-tests: add for_test +* rs/unit-tests-test-run (2024-07-30) 6 commits + - t-strvec: use if_test + - t-reftable-basics: use if_test + - t-ctype: use if_test + - unit-tests: add if_test - unit-tests: show location of checks outside of tests - t0080: use here-doc test body Unit-test framework clean-up. Still under discussion. - source: <73465c3d-1be0-456b-9471-f875e819c566@web.de> + source: <077a178e-eb30-45ff-b653-a514bfd33077@web.de> * jc/patch-id (2024-07-29) 5 commits - . patch-id: tighten code to detect the patch header - . patch-id: rewrite code that detects the beginning of a patch + - patch-id: tighten code to detect the patch header + - patch-id: rewrite code that detects the beginning of a patch - patch-id: make get_one_patchid() more extensible - patch-id: call flush_current_id() only when needed - t4204: patch-id supports various input format @@ -559,18 +703,4 @@ Release tarballs are available at: message. Inviding further discussion. - source: <20240621231826.3280338-1-gitster@pobox.com> - --------------------------------------------------- -[Discarded] - -* jk/add-patch-with-suppress-blank-empty (2024-07-10) 1 commit - (merged to 'next' on 2024-07-11 at cec8ebb668) - + add-patch: handle splitting hunks with diff.suppressBlankEmpty - - When the diff.suppressBlankEmpty configuration variable is set, - "git add -p" failed to process a patch with an unmodified empty - line, which has been corrected. - - Reverted out of 'next'. - source: <20240710093610.GA2076910@coredump.intra.peff.net> + source: <20240730011738.4032377-1-gitster@pobox.com>