diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-04-06 14:04:31 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-04-06 14:04:31 -0700 |
commit | 1b21701f49696fb6e0bbee8b4fa6f5b37b983ddc (patch) | |
tree | 1be4dfaa2505b6a2aa1b1b5ca03e1ff99f11f3a4 | |
parent | 6d3ecae174559b4decd971d908f2658e9bd90833 (diff) | |
download | git-1b21701f49696fb6e0bbee8b4fa6f5b37b983ddc.tar.gz |
What's cooking (2023/04 #02)
-rw-r--r-- | whats-cooking.txt | 796 |
1 files changed, 330 insertions, 466 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index 19ed4758b1..f7d1f6db08 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 (Apr 2023, #01; Tue, 4) -X-master-at: ae73b2c8f1da39c39335ee76a0f95857712c22a7 -X-next-at: 699aa5c54e8a07724f4438867e3ecd26ba51585d +Subject: What's cooking in git.git (Apr 2023, #02; Thu, 6) +X-master-at: 0607f793cbe0af16aee6d2480056d891835884bd +X-next-at: 4ca3ef321147b456561d0c3a4c90cbb38891a488 Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (Apr 2023, #01; Tue, 4) +What's cooking in git.git (Apr 2023, #02; Thu, 6) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -16,6 +16,11 @@ message that raises issues but they are no means exhaustive. A topic without enough support may be discarded after a long period of no activity. +We are in the middle of the 4th week of an 10-week cycle which is +expected to last til the end of May. With quite a many topics that +have been cooking in 'next' already graduated to 'master', it is a +good time to rewind the tip of 'next', which I'll be doing shortly. + Copies of the source code to Git live in many repositories, and the following is a list of the ones I push into or their mirrors. Some repositories have only a subset of branches. @@ -47,336 +52,284 @@ Release tarballs are available at: -------------------------------------------------- [Graduated to 'master'] -* ab/retire-scripted-add-p (2023-03-27) 1 commit - (merged to 'next' on 2023-03-27 at f8cbc0c604) - + t3701: we don't need no Perl for `add -i` anymore - - Test fix. - source: <pull.1504.git.1679898996492.gitgitgadget@gmail.com> - - -* ah/rebase-merges-config (2023-03-27) 3 commits - (merged to 'next' on 2023-03-27 at c8a894ba4b) - + rebase: add a config option for --rebase-merges - + rebase: deprecate --rebase-merges="" - + rebase: add documentation and test for --no-rebase-merges - - Streamline --rebase-merges command line option handling and - introduce rebase.merges configuration variable. - source: <20230326030636.2635642-1-alexhenrie24@gmail.com> - - -* ar/test-cleanup-unused-file-creation (2023-03-20) 7 commits - (merged to 'next' on 2023-03-28 at ad035b41ea) - + t1507: assert output of rev-parse - + t1404: don't create unused file - + t1400: assert output of update-ref - + t1302: don't create unused file - + t1010: don't create unused files - + t1006: assert error output of cat-file - + t1005: assert output of ls-files - - Test clean-up. - source: <20230312201520.370234-1-rybak.a.v@gmail.com> - - -* bb/unicode-width-table-15 (2023-03-30) 1 commit - (merged to 'next' on 2023-03-31 at b8f3e899ac) - + unicode: update the width tables to Unicode 15 - - Update width table for the latest edition of Unicode. - source: <20230330191517.1762375-1-dev+git@drbeat.li> - - -* ds/p2000-fix-grep-sparse (2023-03-28) 1 commit - (merged to 'next' on 2023-03-29 at 6a59283aa3) - + p2000: remove stray '--sparse' flag from test - - Fix perf test. - source: <pull.1505.git.1680034162144.gitgitgadget@gmail.com> - - -* jc/am-doc-refer-to-format-patch (2023-03-21) 1 commit - (merged to 'next' on 2023-03-23 at 01b35c0581) - + am: refer to format-patch in the documentation +* ab/config-multi-and-nonbool (2023-03-28) 9 commits + (merged to 'next' on 2023-03-30 at bcfe99b43d) + + for-each-repo: with bad config, don't conflate <path> and <cmd> + + config API: add "string" version of *_value_multi(), fix segfaults + + config API users: test for *_get_value_multi() segfaults + + for-each-repo: error on bad --config + + config API: have *_multi() return an "int" and take a "dest" + + versioncmp.c: refactor config reading next commit + + config API: add and use a "git_config_get()" family of functions + + config tests: add "NULL" tests for *_get_value_multi() + + config tests: cover blind spots in git_die_config() tests - Doc update. - source: <xmqq1qlij9qr.fsf@gitster.g> + Assorted config API updates. + source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com> -* jk/blame-contents-with-arbitrary-commit (2023-03-24) 1 commit - (merged to 'next' on 2023-03-27 at 74beb3baf9) - + blame: allow --contents to work with non-HEAD commit +* ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits + (merged to 'next' on 2023-03-30 at e0abe2d872) + + libs: use "struct repository *" argument, not "the_repository" + + post-cocci: adjust comments for recent repo_* migration + + cocci: apply the "revision.h" part of "the_repository.pending" + + cocci: apply the "rerere.h" part of "the_repository.pending" + + cocci: apply the "refs.h" part of "the_repository.pending" + + cocci: apply the "promisor-remote.h" part of "the_repository.pending" + + cocci: apply the "packfile.h" part of "the_repository.pending" + + cocci: apply the "pretty.h" part of "the_repository.pending" + + cocci: apply the "object-store.h" part of "the_repository.pending" + + cocci: apply the "diff.h" part of "the_repository.pending" + + cocci: apply the "commit.h" part of "the_repository.pending" + + cocci: apply the "commit-reach.h" part of "the_repository.pending" + + cocci: apply the "cache.h" part of "the_repository.pending" + + cocci: add missing "the_repository" macros to "pending" + + cocci: sort "the_repository" rules by header + + cocci: fix incorrect & verbose "the_repository" rules + + cocci: remove dead rule from "the_repository.pending.cocci" + (this branch is used by en/header-split-cache-h.) - "git blame --contents=<file> <rev> -- <path>" used to be forbidden, - but now it finds the origins of lines starting at <file> contents - through the history that leads to <rev>. - source: <20230324170800.331022-1-jacob.e.keller@intel.com> + Code clean-up around the use of the_repository. + source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com> -* jk/document-rev-list-object-name (2023-03-28) 1 commit - (merged to 'next' on 2023-03-29 at e1cd79f572) - + docs: document caveats of rev-list's object-name output +* ds/ahead-behind (2023-03-20) 9 commits + (merged to 'next' on 2023-03-23 at a607895174) + + commit-reach: add tips_reachable_from_bases() + + for-each-ref: add ahead-behind format atom + + commit-reach: implement ahead_behind() logic + + commit-graph: introduce `ensure_generations_valid()` + + commit-graph: return generation from memory + + commit-graph: simplify compute_generation_numbers() + + commit-graph: refactor compute_topological_levels() + + for-each-ref: explicitly test no matches + + for-each-ref: add --stdin option + (this branch is used by ps/ahead-behind-truncation-fix.) - Document what the pathname-looking strings in "rev-list --object" - output are for and what they mean. - source: <20230328182650.GC18558@coredump.intra.peff.net> + "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the + distances from a single reference point in the history with bunch + of commits in bulk. + source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com> -* jk/fast-export-cleanup (2023-03-22) 6 commits - (merged to 'next' on 2023-03-27 at 12b9a9308e) - + fast-export: drop unused parameter from anonymize_commit_message() - + fast-export: drop data parameter from anonymous generators - + fast-export: de-obfuscate --anonymize-map handling - + fast-export: factor out anonymized_entry creation - + fast-export: simplify initialization of anonymized hashmaps - + fast-export: drop const when storing anonymized values +* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit + (merged to 'next' on 2023-03-31 at a9f787341d) + + fetch: download bundles once, even with --all - Code clean-up. - source: <20230322173636.GA5643@coredump.intra.peff.net> + "git fetch --all" does not have to download and handle the same + bundleURI over and over, which has been corrected. + source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com> -* jk/really-deprecate-pack-redundant (2023-03-23) 1 commit - (merged to 'next' on 2023-03-29 at 4d1bc9ac42) - + pack-redundant: escalate deprecation warning to an error +* en/header-split-cleanup (2023-03-21) 16 commits + (merged to 'next' on 2023-03-30 at b69ff46cad) + + csum-file.h: remove unnecessary inclusion of cache.h + + write-or-die.h: move declarations for write-or-die.c functions from cache.h + + treewide: remove cache.h inclusion due to setup.h changes + + setup.h: move declarations for setup.c functions from cache.h + + treewide: remove cache.h inclusion due to environment.h changes + + environment.h: move declarations for environment.c functions from cache.h + + treewide: remove unnecessary includes of cache.h + + wrapper.h: move declarations for wrapper.c functions from cache.h + + path.h: move function declarations for path.c functions from cache.h + + cache.h: remove expand_user_path() + + abspath.h: move absolute path functions from cache.h + + environment: move comment_line_char from cache.h + + treewide: remove unnecessary cache.h inclusion from several sources + + treewide: remove unnecessary inclusion of gettext.h + + treewide: be explicit about dependence on gettext.h + + treewide: remove unnecessary cache.h inclusion from a few headers + (this branch is used by en/header-split-cache-h.) - "git pack-redundant" gave a warning when run, as the command has - outlived its usefulness long ago and is nominated for future - removal. Now we escalate to give an error. - source: <20230323204047.GA9290@coredump.intra.peff.net> + Split key function and data structure definitions out of cache.h to + new header files and adjust the users. + source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com> -* js/split-index-fixes (2023-03-27) 4 commits - (merged to 'next' on 2023-03-27 at 3a7b7da0d1) - + unpack-trees: take care to propagate the split-index flag - + fsmonitor: avoid overriding `cache_changed` bits - + split-index; stop abusing the `base_oid` to strip the "link" extension - + split-index & fsmonitor: demonstrate a bug +* gc/config-parsing-cleanup (2023-03-28) 8 commits + (merged to 'next' on 2023-03-30 at e7ea626edf) + + config.c: rename "struct config_source cf" + + config: report cached filenames in die_bad_number() + + config.c: remove current_parsing_scope + + config.c: remove current_config_kvi + + config.c: plumb the_reader through callbacks + + config.c: create config_reader and the_reader + + config.c: don't assign to "cf_global" directly + + config.c: plumb config_source through static fns - The index files can become corrupt under certain conditions when - the split-index feature is in use, especially together with - fsmonitor, which have been corrected. - source: <pull.1497.v2.git.1679870743.gitgitgadget@gmail.com> + Config API clean-up to reduce its dependence on static variables + source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com> -* js/t5563-portability-fix (2023-03-31) 1 commit - (merged to 'next' on 2023-03-31 at 12f95a9567) - + t5563: prevent "ambiguous redirect" +* jk/chainlint-fixes (2023-03-30) 5 commits + (merged to 'next' on 2023-03-30 at 52f229b710) + + tests: skip test_eval_ in internal chain-lint + + tests: drop here-doc check from internal chain-linter + + tests: diagnose unclosed here-doc in chainlint.pl + + tests: replace chainlint subshell with a function + + tests: run internal chain-linter under "make test" - Test portability fix. - source: <pull.1507.git.1680245525637.gitgitgadget@gmail.com> + Test framework fix. + source: <20230330192712.GA27719@coredump.intra.peff.net> -* kh/commentchar-config-error-message (2023-03-27) 1 commit - (merged to 'next' on 2023-03-27 at 7fdda0a984) - + config: tell the user that we expect an ASCII character +* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit + (merged to 'next' on 2023-03-30 at e9d10e27a4) + + pack-redundant: document deprecation - Doc update. - source: <20230327194344.12910-1-code@khaugsbakk.name> + Document that we have marked "pack-redundant" as deprecated. + source: <20230328190641.GF18558@coredump.intra.peff.net> -* mk/workaround-pcre-jit-ucp-bug (2023-03-23) 1 commit - (merged to 'next' on 2023-03-24 at d6c402a77b) - + grep: work around UTF-8 related JIT bug in PCRE2 <= 10.34 +* jk/unused-post-2.40 (2023-03-17) 4 commits + (merged to 'next' on 2023-03-30 at 10aeb0d4ae) + + transport: mark unused parameters in fetch_refs_from_bundle() + + http: mark unused parameter in fill_active_slot() callbacks + + http: drop unused parameter from start_object_request() + + mailmap: drop debugging code - A recent-ish change to allow unicode character classes to be used - with "grep -P" triggered a JIT bug in older pcre2 libraries. - The problematic change in Git built with these older libraries has - been disabled to work around the bug. - source: <20230323172539.25230-1-minipli@grsecurity.net> + More "-Wunused-parameters" code clean-up. + source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net> -* ob/rollback-after-commit-lock-failure (2023-03-24) 1 commit - (merged to 'next' on 2023-03-27 at ea237a011c) - + sequencer: remove pointless rollback_lock_file() +* jk/unused-post-2.40-part2 (2023-03-28) 7 commits + (merged to 'next' on 2023-03-29 at 7aeee1b6c6) + + parse-options: drop parse_opt_unknown_cb() + + t/helper: mark unused argv/argc arguments + + mark "argv" as unused when we check argc + + builtins: mark unused prefix parameters + + builtins: annotate always-empty prefix parameters + + builtins: always pass prefix to parse_options() + + fast-import: fix file access when run from subdir - Code clean-up. - source: <20230323162235.995529-1-oswald.buddenhagen@gmx.de> + Code clean-up for "-Wunused-parameter" build. + source: <20230328205253.GA1753925@coredump.intra.peff.net> -* ob/sequencer-save-head-simplify (2023-03-24) 1 commit - (merged to 'next' on 2023-03-27 at 388e26f1d1) - + sequencer: rewrite save_head() in terms of write_message() +* ow/ref-format-remove-unused-member (2023-03-30) 1 commit + (merged to 'next' on 2023-03-30 at 898a5df956) + + ref-filter: remove unused ref_format member Code clean-up. - source: <20230323162235.995544-1-oswald.buddenhagen@gmx.de> - - -* pw/wildmatch-fixes (2023-03-27) 4 commits - (merged to 'next' on 2023-03-27 at 40f52ba243) - + t3070: make chain lint tester happy - (merged to 'next' on 2023-03-24 at d0d1f23565) - + wildmatch: hide internal return values - + wildmatch: avoid undefined behavior - + wildmatch: fix exponential behavior - - The wildmatch library code unlearns exponential behaviour it - acquired some time ago since it was borrowed from rsync. - source: <cover.1679328580.git.phillip.wood@dunelm.org.uk> - - -* rs/archive-mtime (2023-03-27) 1 commit - (merged to 'next' on 2023-03-27 at 672cd32edf) - + t5000: use check_mtime() - - Test update. - source: <233edbbe-35c1-9b5b-7578-4c70c6d24449@web.de> + source: <20230330112133.4437-2-oystwa@gmail.com> -* sg/parse-options-h-initializers (2023-03-20) 3 commits - (merged to 'next' on 2023-03-23 at f16b3ab6d7) - + parse-options.h: use designated initializers in OPT_* macros - + parse-options.h: rename _OPT_CONTAINS_OR_WITH()'s parameters - + parse-options.h: use consistent name for the callback parameters +* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit + (merged to 'next' on 2023-03-31 at 60bc243011) + + commit-graph: fix truncated generation numbers + (this branch uses ds/ahead-behind.) - Code clean-up to use designated initializers in parse-options API. - source: <20230319165648.656738-1-szeder.dev@gmail.com> + Fix unnecessary truncation of generation numbers used in-core. + source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im> -* sg/parse-options-h-users (2023-03-20) 2 commits - (merged to 'next' on 2023-03-23 at 2ca7d1e737) - + treewide: remove unnecessary inclusions of parse-options.h from headers - + treewide: include parse-options.h in source files +* ps/fetch-ref-update-reporting (2023-03-20) 6 commits + (merged to 'next' on 2023-03-30 at e5df1cae0b) + + fetch: centralize printing of reference updates + + fetch: centralize logic to print remote URL + + fetch: centralize handling of per-reference format + + fetch: pass the full local reference name to `format_display` + + fetch: move output format into `display_state` + + fetch: move reference width calculation into `display_state` - Code clean-up to include and/or uninclude parse-options.h file as - needed. - source: <20230319162712.654137-1-szeder.dev@gmail.com> + Clean-up of the code path that reports what "git fetch" did to each + ref. + source: <cover.1679315383.git.ps@pks.im> -* ss/hashmap-typofix (2023-03-30) 1 commit - (merged to 'next' on 2023-03-30 at ac1e443424) - + hashmap.h: fix minor typo +* sm/ssl-key-type-config (2023-03-23) 1 commit + (merged to 'next' on 2023-03-30 at 773716fc60) + + http: add support for different sslcert and sslkey types. - Typofix. - source: <pull.1506.git.1680190083688.gitgitgadget@gmail.com> + Add a few configuration variables to tell the cURL library that + different types of ssl-cert and ssl-key are in use. + source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com> -------------------------------------------------- [New Topics] -* ow/ref-filter-omit-empty (2023-03-30) 1 commit - - branch, for-each-ref: add option to omit empty lines - - "git branch --format=..." and "git format-patch --format=..." - learns "--omit-empty-lines" to hide refs that whose formatting - result becomes an empty string from the output. - - Expecting a reroll. "git tag" should learn the same. - cf. <xmqqilei1bgk.fsf@gitster.g> - source: <20230330112133.4437-3-oystwa@gmail.com> +* dw/doc-submittingpatches-grammofix (2023-04-05) 1 commit + (merged to 'next' on 2023-04-05 at 2691fad020) + + SubmittingPatches: clarify MUA discussion with "the" + Originally merged to 'next' on 2023-04-05 -* ow/ref-format-remove-unused-member (2023-03-30) 1 commit - (merged to 'next' on 2023-03-30 at 898a5df956) - + ref-filter: remove unused ref_format member - - Code clean-up. + Grammofix. Will merge to 'master'. - source: <20230330112133.4437-2-oystwa@gmail.com> + source: <ZC0yey+S+OD/S2tt@trent-reznor> -* rn/sparse-describe (2023-04-03) 1 commit - - describe: enable sparse index for describe +* fc/doc-manpage-base-url-fix (2023-04-05) 1 commit + - doc: remove manpage-base-url workaround - "git describe --dirty" learns to work better with sparse-index. + Modernize manpage generation toolchain. - Will merge to 'next'? - source: <20230403164749.246001-1-nanth.raghul@gmail.com> + Will merge to 'next'. + source: <20230322000815.132128-1-felipe.contreras@gmail.com> -* ds/fetch-bundle-uri-with-all (2023-03-31) 1 commit - (merged to 'next' on 2023-03-31 at a9f787341d) - + fetch: download bundles once, even with --all +* jc/clone-object-format-from-void (2023-04-05) 1 commit + - clone: propagate object-format when cloning from void - "git fetch --all" does not have to download and handle the same - bundleURI over and over, which has been corrected. + "git clone" from an empty repository learned to propagate the + choice of the hash algorithm from the source repository to the + newly created repository. - Will merge to 'master'. - source: <pull.1508.git.1680278344173.gitgitgadget@gmail.com> + Will merge to 'next'. + source: <xmqq355euj2i.fsf@gitster.g> -* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits - (merged to 'next' on 2023-04-04 at 48861fc381) - + t2107: fix mention of the_index.cache_changed - + t3060: fix mention of function prune_index +* rj/sendemail-validate-series-hook (2023-04-05) 1 commit + - hooks: add sendemail-validate-series - Comment updates. + "git send-email" learns a new hook that takes the entire set of + patch files from its standard input to validate them in one go, + instead of getting called once per each file. - Will merge to 'master'. - source: <20230331143604.82040-2-rybak.a.v@gmail.com> + Comments? + source: <20230405231305.96996-1-robin@jarry.cc> -* ah/format-patch-thread-doc (2023-04-03) 1 commit - - format-patch: correct documentation of --thread without an argument +* tk/mergetool-gui-default-config (2023-04-05) 1 commit + - mergetool: new config guiDefault supports auto-toggling gui by DISPLAY - Doc update. + "git mergetool" and "git difftool" learns a new configuration + guiDefault to optionally favor configured guitool over non-gui-tool + automatically when $DISPLAY is set. - source: <20230403040724.642513-1-alexhenrie24@gmail.com> + Will merge to 'next'. + source: <pull.1381.v4.git.1679153263217.gitgitgadget@gmail.com> -* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits - - t2019: don't create unused files - - t1502: don't create unused files - - t1450: don't create unused files - - t1300: don't create unused files - - t1300: fix config file syntax error descriptions - - t0300: don't create unused file +* cm/branch-delete-error-message-update (2023-04-06) 1 commit + - branch: improve error log on branch not found by checking remotes refs - Test cleanup. + "git branch -d origin/master" would say "no such branch", but it is + likely a missed "-r" if refs/remotes/origin/master exists. The + command has been taught to give such a hint in its error message. Will merge to 'next'? - source: <20230403223338.468025-1-rybak.a.v@gmail.com> - - -* en/header-split-cache-h (2023-04-04) 25 commits - - mailmap, quote: move declarations of global vars to correct unit - - treewide: reduce includes of cache.h in other headers - - treewide: remove double forward declaration of read_in_full - - strbuf: move forward declarations to beginning of file - - cache.h: remove unnecessary includes - - treewide: remove cache.h inclusion due to pager.h changes - - pager.h: move declarations for pager.c functions from cache.h - - treewide: remove cache.h inclusion due to editor.h changes - - editor: move editor-related functions and declarations into common file - - treewide: remove cache.h inclusion due to object.h changes - - object.h: move some inline functions and defines from cache.h - - treewide: remove cache.h inclusion due to object-file.h changes - - object-file.h: move declarations for object-file.c functions from cache.h - - treewide: remove cache.h inclusion due to git-zlib changes - - git-zlib: move declarations for git-zlib functions from cache.h - - treewide: remove cache.h inclusion due to object-name.h changes - - object-name.h: move declarations for object-name.c functions from cache.h - - treewide: remove unnecessary cache.h inclusion - - treewide: be explicit about dependence on mem-pool.h - - treewide: be explicit about dependence on oid-array.h - - treewide: be explicit about dependence on pack-revindex.h - - treewide: be explicit about dependence on convert.h - - treewide: be explicit about dependence on advice.h - - treewide: be explicit about dependence on trace.h & trace2.h - - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h - (this branch uses ab/remove-implicit-use-of-the-repository and en/header-split-cleanup.) - - Header clean-up. + source: <pull.1476.v3.git.git.1680695000257.gitgitgadget@gmail.com> - source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com> +* fc/remove-header-workarounds-for-asciidoc (2023-04-05) 1 commit + - doc: asciidoc: remove custom header macro -* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit - - object-info: init request_info before reading arg + Doc toolchain update to remove old workaround for AsciiDoc. - Correct use of an uninitialized structure member. - - Will merge to 'next'. - source: <20230402130557.17662-1-worldhello.net@gmail.com> + Will merge to 'next'? + source: <20230323221523.52472-1-felipe.contreras@gmail.com> -* sl/sparse-write-tree (2023-04-04) 1 commit - - write-tree: integrate with sparse index +* jk/use-perl-path-consistently (2023-04-06) 1 commit + - t/lib-httpd: pass PERL_PATH to CGI scripts - "git write-tree" learns to work better with sparse-index. + Tests had a few places where we ignored PERL_PATH and blindly used + /usr/bin/perl, which have been corrected. Will merge to 'next'. - source: <20230404003539.1578245-1-cheskaqiqi@gmail.com> + source: <20230406093602.GD2215039@coredump.intra.peff.net> -------------------------------------------------- [Stalled] @@ -439,16 +392,6 @@ Release tarballs are available at: source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com> -* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit - (merged to 'next' on 2023-04-04 at 4cfa5997eb) - + e-mail workflow: Message-ID is spelled with ID in both capital letters - - Consistently spell "Message-ID" as such, not "Message-Id". - - Will merge to 'master'. - source: <xmqqsfhgnmqg.fsf@gitster.g> - - * ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit - test-lib: allow storing counts with test harnesses @@ -475,15 +418,124 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] -* sm/ssl-key-type-config (2023-03-23) 1 commit - (merged to 'next' on 2023-03-30 at 773716fc60) - + http: add support for different sslcert and sslkey types. +* ow/ref-filter-omit-empty (2023-04-06) 1 commit + - branch, for-each-ref: add option to omit empty lines + + "git branch --format=..." and "git format-patch --format=..." + learns "--omit-empty" to hide refs that whose formatting result + becomes an empty string from the output. + + Looking good. + source: <20230406170837.10060-3-oystwa@gmail.com> - Add a few configuration variables to tell the cURL library that - different types of ssl-cert and ssl-key are in use. + +* jc/spell-id-in-both-caps-in-message-id (2023-04-03) 1 commit + (merged to 'next' on 2023-04-04 at 4cfa5997eb) + + e-mail workflow: Message-ID is spelled with ID in both capital letters + + Originally merged to 'next' on 2023-04-04 + + Consistently spell "Message-ID" as such, not "Message-Id". Will merge to 'master'. - source: <pull.1474.v2.git.git.1679327330032.gitgitgadget@gmail.com> + source: <xmqqsfhgnmqg.fsf@gitster.g> + + +* rn/sparse-describe (2023-04-03) 1 commit + - describe: enable sparse index for describe + + "git describe --dirty" learns to work better with sparse-index. + + Will merge to 'next'? + source: <20230403164749.246001-1-nanth.raghul@gmail.com> + + +* ar/adjust-tests-for-the-index-fallout (2023-03-31) 2 commits + (merged to 'next' on 2023-04-04 at 48861fc381) + + t2107: fix mention of the_index.cache_changed + + t3060: fix mention of function prune_index + + Originally merged to 'next' on 2023-04-04 + + Comment updates. + + Will merge to 'master'. + source: <20230331143604.82040-2-rybak.a.v@gmail.com> + + +* ah/format-patch-thread-doc (2023-04-03) 1 commit + - format-patch: correct documentation of --thread without an argument + + Doc update. + source: <20230403040724.642513-1-alexhenrie24@gmail.com> + + +* ar/test-cleanup-unused-file-creation-part2 (2023-04-03) 6 commits + - t2019: don't create unused files + - t1502: don't create unused files + - t1450: don't create unused files + - t1300: don't create unused files + - t1300: fix config file syntax error descriptions + - t0300: don't create unused file + + Test cleanup. + + Will merge to 'next'? + source: <20230403223338.468025-1-rybak.a.v@gmail.com> + + +* en/header-split-cache-h (2023-04-04) 25 commits + - mailmap, quote: move declarations of global vars to correct unit + - treewide: reduce includes of cache.h in other headers + - treewide: remove double forward declaration of read_in_full + - strbuf: move forward declarations to beginning of file + - cache.h: remove unnecessary includes + - treewide: remove cache.h inclusion due to pager.h changes + - pager.h: move declarations for pager.c functions from cache.h + - treewide: remove cache.h inclusion due to editor.h changes + - editor: move editor-related functions and declarations into common file + - treewide: remove cache.h inclusion due to object.h changes + - object.h: move some inline functions and defines from cache.h + - treewide: remove cache.h inclusion due to object-file.h changes + - object-file.h: move declarations for object-file.c functions from cache.h + - treewide: remove cache.h inclusion due to git-zlib changes + - git-zlib: move declarations for git-zlib functions from cache.h + - treewide: remove cache.h inclusion due to object-name.h changes + - object-name.h: move declarations for object-name.c functions from cache.h + - treewide: remove unnecessary cache.h inclusion + - treewide: be explicit about dependence on mem-pool.h + - treewide: be explicit about dependence on oid-array.h + - treewide: be explicit about dependence on pack-revindex.h + - treewide: be explicit about dependence on convert.h + - treewide: be explicit about dependence on advice.h + - treewide: be explicit about dependence on trace.h & trace2.h + - Merge branch 'ab/remove-implicit-use-of-the-repository' into en/header-split-cache-h + + Header clean-up. + + Will merge to 'next'? + source: <pull.1509.v2.git.1680571348.gitgitgadget@gmail.com> + + +* jx/cap-object-info-uninitialized-fix (2023-04-03) 1 commit + (merged to 'next' on 2023-04-05 at d56fe6eedc) + + object-info: init request_info before reading arg + + Originally merged to 'next' on 2023-04-05 + + Correct use of an uninitialized structure member. + + Will merge to 'master'. + source: <20230402130557.17662-1-worldhello.net@gmail.com> + + +* sl/sparse-write-tree (2023-04-04) 1 commit + - write-tree: integrate with sparse index + + "git write-tree" learns to work better with sparse-index. + + Will merge to 'next'. + source: <20230404003539.1578245-1-cheskaqiqi@gmail.com> * ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit @@ -497,22 +549,13 @@ Release tarballs are available at: source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com> -* ps/ahead-behind-truncation-fix (2023-03-27) 1 commit - (merged to 'next' on 2023-03-31 at 60bc243011) - + commit-graph: fix truncated generation numbers - (this branch uses ds/ahead-behind.) - - Fix unnecessary truncation of generation numbers used in-core. - - Will merge to 'master'. - source: <f8a0a869e8b0882f05cac49d78f49ba3553d3c44.1679904401.git.ps@pks.im> - - * ws/sparse-check-rules (2023-03-27) 2 commits (merged to 'next' on 2023-04-04 at 17a29244a6) + builtin/sparse-checkout: add check-rules command + builtin/sparse-checkout: remove NEED_WORK_TREE flag + Originally merged to 'next' on 2023-04-04 + "git sparse-checkout" command learns a debugging aid for the sparse rule definitions. @@ -540,30 +583,6 @@ Release tarballs are available at: source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com> -* jk/chainlint-fixes (2023-03-30) 5 commits - (merged to 'next' on 2023-03-30 at 52f229b710) - + tests: skip test_eval_ in internal chain-lint - + tests: drop here-doc check from internal chain-linter - + tests: diagnose unclosed here-doc in chainlint.pl - + tests: replace chainlint subshell with a function - + tests: run internal chain-linter under "make test" - - Test framework fix. - - Will merge to 'master'. - source: <20230330192712.GA27719@coredump.intra.peff.net> - - -* jk/document-pack-redundant-deprecation (2023-03-30) 1 commit - (merged to 'next' on 2023-03-30 at e9d10e27a4) - + pack-redundant: document deprecation - - Document that we have marked "pack-redundant" as deprecated. - - Will merge to 'master'. - source: <20230328190641.GF18558@coredump.intra.peff.net> - - * ob/revert-of-revert (2023-03-28) 1 commit - sequencer: call a revert of a revert "reapply" @@ -574,22 +593,6 @@ Release tarballs are available at: source: <20230323162234.995465-1-oswald.buddenhagen@gmx.de> -* jk/unused-post-2.40-part2 (2023-03-28) 7 commits - (merged to 'next' on 2023-03-29 at 7aeee1b6c6) - + parse-options: drop parse_opt_unknown_cb() - + t/helper: mark unused argv/argc arguments - + mark "argv" as unused when we check argc - + builtins: mark unused prefix parameters - + builtins: annotate always-empty prefix parameters - + builtins: always pass prefix to parse_options() - + fast-import: fix file access when run from subdir - - Code clean-up for "-Wunused-parameter" build. - - Will merge to 'master'. - source: <20230328205253.GA1753925@coredump.intra.peff.net> - - * pw/sequencer-rescheduled-ones-are-not-done-yet (2023-03-20) 1 commit - rebase -i: do not update "done" when rescheduling command @@ -617,39 +620,14 @@ Release tarballs are available at: + pack-bitmap.c: hide bitmap internals in `read_be32()` + pack-bitmap.c: hide bitmap internals in `read_u8()` + Originally merged to 'next' on 2023-03-21 + Clean-up the pack-bitmap codepath. On hold. There is a BUG() on data errors. source: <cover.1679342296.git.me@ttaylorr.com> -* en/header-split-cleanup (2023-03-21) 16 commits - (merged to 'next' on 2023-03-30 at b69ff46cad) - + csum-file.h: remove unnecessary inclusion of cache.h - + write-or-die.h: move declarations for write-or-die.c functions from cache.h - + treewide: remove cache.h inclusion due to setup.h changes - + setup.h: move declarations for setup.c functions from cache.h - + treewide: remove cache.h inclusion due to environment.h changes - + environment.h: move declarations for environment.c functions from cache.h - + treewide: remove unnecessary includes of cache.h - + wrapper.h: move declarations for wrapper.c functions from cache.h - + path.h: move function declarations for path.c functions from cache.h - + cache.h: remove expand_user_path() - + abspath.h: move absolute path functions from cache.h - + environment: move comment_line_char from cache.h - + treewide: remove unnecessary cache.h inclusion from several sources - + treewide: remove unnecessary inclusion of gettext.h - + treewide: be explicit about dependence on gettext.h - + treewide: remove unnecessary cache.h inclusion from a few headers - (this branch is used by en/header-split-cache-h.) - - Split key function and data structure definitions out of cache.h to - new header files and adjust the users. - - Will merge to 'master'. - source: <pull.1493.v2.git.1679379968.gitgitgadget@gmail.com> - - * nw/for-each-ref-signature (2023-03-13) 1 commit . ref-filter: add new "signature" atom @@ -680,74 +658,16 @@ Release tarballs are available at: source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com> -* ps/fetch-ref-update-reporting (2023-03-20) 6 commits - (merged to 'next' on 2023-03-30 at e5df1cae0b) - + fetch: centralize printing of reference updates - + fetch: centralize logic to print remote URL - + fetch: centralize handling of per-reference format - + fetch: pass the full local reference name to `format_display` - + fetch: move output format into `display_state` - + fetch: move reference width calculation into `display_state` - - Clean-up of the code path that reports what "git fetch" did to each - ref. - - Will merge to 'master'. - source: <cover.1679315383.git.ps@pks.im> - - -* pw/rebase-cleanup-merge-strategy-option-handling (2023-03-15) 5 commits +* pw/rebase-cleanup-merge-strategy-option-handling (2023-04-05) 5 commits - rebase: remove a couple of redundant strategy tests - rebase -m: fix serialization of strategy options - rebase -m: cleanup --strategy-option handling + - sequencer: use struct strvec to store merge strategy options - rebase: stop reading and writing unnecessary strategy state - - Merge branch 'ab/fix-strategy-opts-parsing' Clean-up of the code path that deals with merge strategy option handling in "git rebase". - - Needs review. - source: <cover.1678893298.git.phillip.wood@dunelm.org.uk> - - -* ab/remove-implicit-use-of-the-repository (2023-03-28) 17 commits - (merged to 'next' on 2023-03-30 at e0abe2d872) - + libs: use "struct repository *" argument, not "the_repository" - + post-cocci: adjust comments for recent repo_* migration - + cocci: apply the "revision.h" part of "the_repository.pending" - + cocci: apply the "rerere.h" part of "the_repository.pending" - + cocci: apply the "refs.h" part of "the_repository.pending" - + cocci: apply the "promisor-remote.h" part of "the_repository.pending" - + cocci: apply the "packfile.h" part of "the_repository.pending" - + cocci: apply the "pretty.h" part of "the_repository.pending" - + cocci: apply the "object-store.h" part of "the_repository.pending" - + cocci: apply the "diff.h" part of "the_repository.pending" - + cocci: apply the "commit.h" part of "the_repository.pending" - + cocci: apply the "commit-reach.h" part of "the_repository.pending" - + cocci: apply the "cache.h" part of "the_repository.pending" - + cocci: add missing "the_repository" macros to "pending" - + cocci: sort "the_repository" rules by header - + cocci: fix incorrect & verbose "the_repository" rules - + cocci: remove dead rule from "the_repository.pending.cocci" - (this branch is used by en/header-split-cache-h.) - - Code clean-up around the use of the_repository. - - Will merge to 'master'. - source: <cover-v2-00.17-00000000000-20230328T110946Z-avarab@gmail.com> - - -* jk/unused-post-2.40 (2023-03-17) 4 commits - (merged to 'next' on 2023-03-30 at 10aeb0d4ae) - + transport: mark unused parameters in fetch_refs_from_bundle() - + http: mark unused parameter in fill_active_slot() callbacks - + http: drop unused parameter from start_object_request() - + mailmap: drop debugging code - - More "-Wunused-parameters" code clean-up. - - Will merge to 'master'. - source: <ZBS77VYL9ZrxKtCN@coredump.intra.peff.net> + source: <cover.1680708043.git.phillip.wood@dunelm.org.uk> * sl/diff-files-sparse (2023-03-22) 2 commits @@ -760,44 +680,6 @@ Release tarballs are available at: source: <20230322161820.3609-1-cheskaqiqi@gmail.com> -* ds/ahead-behind (2023-03-20) 9 commits - (merged to 'next' on 2023-03-23 at a607895174) - + commit-reach: add tips_reachable_from_bases() - + for-each-ref: add ahead-behind format atom - + commit-reach: implement ahead_behind() logic - + commit-graph: introduce `ensure_generations_valid()` - + commit-graph: return generation from memory - + commit-graph: simplify compute_generation_numbers() - + commit-graph: refactor compute_topological_levels() - + for-each-ref: explicitly test no matches - + for-each-ref: add --stdin option - (this branch is used by ps/ahead-behind-truncation-fix.) - - "git for-each-ref" learns '%(ahead-behind:<base>)' that computes the - distances from a single reference point in the history with bunch - of commits in bulk. - - Will merge to 'master' together with ps/ahead-behind-truncation-fix topic. - source: <pull.1489.v4.git.1679311615.gitgitgadget@gmail.com> - - -* gc/config-parsing-cleanup (2023-03-28) 8 commits - (merged to 'next' on 2023-03-30 at e7ea626edf) - + config.c: rename "struct config_source cf" - + config: report cached filenames in die_bad_number() - + config.c: remove current_parsing_scope - + config.c: remove current_config_kvi - + config.c: plumb the_reader through callbacks - + config.c: create config_reader and the_reader - + config.c: don't assign to "cf_global" directly - + config.c: plumb config_source through static fns - - Config API clean-up to reduce its dependence on static variables - - Will merge to 'master'. - source: <pull.1463.v3.git.git.1680025914.gitgitgadget@gmail.com> - - * my/wildmatch-cleanups (2023-02-27) 5 commits . wildmatch: more cleanups after killing uchar . wildmatch: use char instead of uchar @@ -871,24 +753,6 @@ Release tarballs are available at: source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com> -* ab/config-multi-and-nonbool (2023-03-28) 9 commits - (merged to 'next' on 2023-03-30 at bcfe99b43d) - + for-each-repo: with bad config, don't conflate <path> and <cmd> - + config API: add "string" version of *_value_multi(), fix segfaults - + config API users: test for *_get_value_multi() segfaults - + for-each-repo: error on bad --config - + config API: have *_multi() return an "int" and take a "dest" - + versioncmp.c: refactor config reading next commit - + config API: add and use a "git_config_get()" family of functions - + config tests: add "NULL" tests for *_get_value_multi() - + config tests: cover blind spots in git_die_config() tests - - Assorted config API updates. - - Will merge to 'master'. - source: <cover-v8-0.9-00000000000-20230328T140126Z-avarab@gmail.com> - - * cb/checkout-same-branch-twice (2023-03-22) 2 commits - SQUASH??? the test marked to expect failure passes from day one - checkout/switch: disallow checking out same branch in multiple worktrees |