diff options
author | Junio C Hamano <gitster@pobox.com> | 2023-05-11 16:34:33 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2023-05-11 16:34:33 -0700 |
commit | 36139febcc6c83748be8c787e099a3ef5f9adc27 (patch) | |
tree | fd0064f40cefc345efabd08ea7dbacd537ee6cc7 | |
parent | 66304ed9aa3f888bdebf7866501cfa3ef17fb252 (diff) | |
download | git-36139febcc6c83748be8c787e099a3ef5f9adc27.tar.gz |
What's cooking (2023/05 #04)
-rw-r--r-- | whats-cooking.txt | 653 |
1 files changed, 279 insertions, 374 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt index c2f2b316c4..a95e60a287 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 (May 2023, #03; Tue, 9) -X-master-at: 5597cfdf47db94825213fefe78c4485e6a5702d8 -X-next-at: 74a8c732097c5a952ed7b01bc0ef452daf5b8643 +Subject: What's cooking in git.git (May 2023, #04; Thu, 11) +X-master-at: 5bc069e383539824fd3a0d897100d44bbe1f8a24 +X-next-at: 37aff9b760842c69945bb44bcc626aaca660805d Bcc: lwn@lwn.net, gitster@pobox.com -What's cooking in git.git (May 2023, #03; Tue, 9) +What's cooking in git.git (May 2023, #04; Thu, 11) -------------------------------------------------- Here are the topics that have been cooking in my tree. Commits @@ -16,11 +16,6 @@ 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 getting closer to pre-release freeze. As I prefer to have -any non-trivial topics cook for 7 calendar days in 'next', anything -not in 'next' by Friday this week are unlikely to be in -rc1 for the -next release. - 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. @@ -50,241 +45,165 @@ Release tarballs are available at: https://www.kernel.org/pub/software/scm/git/ -------------------------------------------------- -[Graduated to 'master'] +[New Topics] -* en/header-split-cache-h-part-2 (2023-04-24) 22 commits - (merged to 'next' on 2023-05-01 at 722c412915) - + reftable: ensure git-compat-util.h is the first (indirect) include - + diff.h: reduce unnecessary includes - + object-store.h: reduce unnecessary includes - + commit.h: reduce unnecessary includes - + fsmonitor: reduce includes of cache.h - + cache.h: remove unnecessary headers - + treewide: remove cache.h inclusion due to previous changes - + cache,tree: move basic name compare functions from read-cache to tree - + cache,tree: move cmp_cache_name_compare from tree.[ch] to read-cache.c - + hash-ll.h: split out of hash.h to remove dependency on repository.h - + tree-diff.c: move S_DIFFTREE_IFXMIN_NEQ define from cache.h - + dir.h: move DTYPE defines from cache.h - + versioncmp.h: move declarations for versioncmp.c functions from cache.h - + ws.h: move declarations for ws.c functions from cache.h - + match-trees.h: move declarations for match-trees.c functions from cache.h - + pkt-line.h: move declarations for pkt-line.c functions from cache.h - + base85.h: move declarations for base85.c functions from cache.h - + copy.h: move declarations for copy.c functions from cache.h - + server-info.h: move declarations for server-info.c functions from cache.h - + packfile.h: move pack_window and pack_entry from cache.h - + symlinks.h: move declarations for symlinks.c functions from cache.h - + treewide: be explicit about dependence on strbuf.h - (this branch is used by en/header-split-cache-h-part-3.) - - More header clean-up. - source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com> - - -* jk/parse-commit-with-malformed-ident (2023-04-27) 4 commits - (merged to 'next' on 2023-04-28 at cb6ea0412a) - + parse_commit(): describe more date-parsing failure modes - + parse_commit(): handle broken whitespace-only timestamp - + parse_commit(): parse timestamp from end of line - + t4212: avoid putting git on left-hand side of pipe - - The commit object parser has been taught to be a bit more lenient - to parse timestamps on the author/committer line with a malformed - author/committer ident. - source: <20230427081330.GA1461786@coredump.intra.peff.net> - - -* jw/send-email-update-gmail-insn (2023-04-28) 1 commit - (merged to 'next' on 2023-05-01 at cb5d83ee92) - + send-email docs: Remove mention of discontinued gmail feature - - Doc update to drop use of deprecated app-specific password against - gmail. - source: <20221001104609.18453-1-j.witteveen@gmail.com> - - -* mh/fix-detect-compilers-with-nondigit-versions (2023-04-26) 1 commit - (merged to 'next' on 2023-04-28 at c0c54291c2) - + Handle some compiler versions containing a dash - - The detect-compilers script to help auto-tweaking the build system - had trouble working with compilers whose version number has extra - suffixes. The script has been taught that certain suffixes (like - "-win32" in "gcc 10-win32") can be safely stripped as they share - the same features and bugs with the version without the suffix. - source: <20230426004843.3391826-1-mh@glandium.org> - - -* ob/messages-capitalize-exception (2023-04-28) 1 commit - (merged to 'next' on 2023-05-01 at db0ef42b3a) - + messages: capitalization and punctuation exceptions - (this branch uses ob/sequencer-i18n-fix.) - - Message update. - source: <20230428125649.1719796-1-oswald.buddenhagen@gmx.de> - - -* ob/sequencer-i18n-fix (2023-04-28) 1 commit - (merged to 'next' on 2023-05-01 at 242ca8ce15) - + sequencer: actually translate report in do_exec() - (this branch is used by ob/messages-capitalize-exception.) - - Message update. - source: <20230428125649.1719796-2-oswald.buddenhagen@gmx.de> - - -* ob/t3501-retitle (2023-05-01) 1 commit - (merged to 'next' on 2023-05-01 at 52730fcaaa) - + t/t3501-revert-cherry-pick.sh: clarify scope of the file - - Retitle a test script with an overly narrow name. - source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de> +* js/rebase-count-fixes (2023-05-10) 2 commits + - rebase -r: fix the total number shown in the progress + - rebase --update-refs: fix loops --------------------------------------------------- -[New Topics] + A few bugs in the sequencer machinery that results in miscounting + the steps have been corrected. -* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit - (merged to 'next' on 2023-05-09 at f4d7a7d671) - + t9800: correct misuse of 'show -s --raw' in a test + Waiting for responses to reviews. + cf. <b481d212-89c5-5c8e-c99f-6df3909523c7@gmail.com> + source: <pull.1531.git.1683759338.gitgitgadget@gmail.com> - A test fix. + +* ds/merge-tree-use-config (2023-05-10) 1 commit + (merged to 'next' on 2023-05-11 at e0dab53028) + + merge-tree: load default git config + + Allow git forges to disable replace-refs feature while running "git + merge-tree". Will merge to 'master'. - source: <xmqqild5rvvw.fsf@gitster.g> + source: <pull.1530.git.1683745654800.gitgitgadget@gmail.com> +-------------------------------------------------- +[Graduated to 'master'] -* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit - (merged to 'next' on 2023-05-09 at 1d8c3e5dcf) - + push: introduce '--branches' option +* ah/doc-attributes-text (2023-05-03) 1 commit + (merged to 'next' on 2023-05-04 at 121c97817e) + + docs: rewrite the documentation of the text and eol attributes - "git push --all" gained an alias "git push --branches". + Doc update to clarify how text and eol attributes interact to + specify the end-of-line conversion. + source: <20230503044656.221175-2-alexhenrie24@gmail.com> - Will merge to 'master'. - source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com> +* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits + (merged to 'next' on 2023-05-03 at 185f0ec195) + + 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 -* en/header-split-cache-h-part-3 (2023-05-08) 25 commits - - fsmonitor-ll.h: split this header out of fsmonitor.h - - hash-ll, hashmap: move oidhash() to hash-ll - - git-compat-util.h: remove unneccessary include of wildmatch.h - - builtin.h: remove unneccessary includes - - list-objects-filter-options.h: remove unneccessary include - - diff.h: remove unnecessary include of oidset.h - - repository: remove unnecessary include of path.h - - log-tree: replace include of revision.h with simple forward declaration - - cache.h: remove this no-longer-used header - - read-cache*.h: move declarations for read-cache.c functions from cache.h - - repository.h: move declaration of the_index from cache.h - - merge.h: move declarations for merge.c from cache.h - - diff.h: move declaration for global in diff.c from cache.h - - preload-index.h: move declarations for preload-index.c from elsewhere - - sparse-index.h: move declarations for sparse-index.c from cache.h - - name-hash.h: move declarations for name-hash.c from cache.h - - run-command.h: move declarations for run-command.c from cache.h - - statinfo: move stat_{data,validity} functions from cache/read-cache - - read-cache: move shared add/checkout/commit code - - add: modify add_files_to_cache() to avoid globals - - read-cache: move shared commit and ls-files code - - setup: adopt shared init-db & clone code - - init-db, clone: change unnecessary global into passed parameter - - init-db: remove unnecessary global variable & document existing bug - - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3 + Test cleanup. + cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com> + source: <20230417191044.909094-1-rybak.a.v@gmail.com> - source: <pull.1525.git.1683431149.gitgitgadget@gmail.com> +* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit + (merged to 'next' on 2023-05-04 at c2fd654367) + + doc: remove custom callouts format -* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit - - subtree: support long global flags + Our custom callout formatter is no longer used in the documentation + formatting toolchain, as the upstream default ones give better + output these days. + source: <20230418011828.47851-1-felipe.contreras@gmail.com> - "git subtree" (in contrib/) update. - Will merge to 'next'. - source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com> +* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit + (merged to 'next' on 2023-05-04 at d048eb1ef8) + + doc: manpage: remove maximum title length + The titles of manual pages used to be chomped at an unreasonably + short limit, which has been removed. + source: <20230503171658.8996-1-felipe.contreras@gmail.com> -* js/gitk-fixes-from-gfw (2023-05-08) 3 commits - (merged to 'next' on 2023-05-08 at adb334deec) - + Merge gitk changes into js/gitk-fixes-from-gfw - + gitk: escape file paths before piping to git log - + gitk: prevent overly long command lines - Gitk updates from GfW project. +* hx/negotiator-non-recursive (2023-04-26) 2 commits + (merged to 'next' on 2023-05-02 at 64f97cc72d) + + negotiator/skipping: fix some problems in mark_common() + + negotiator/default: avoid stack overflow - Will merge to 'master'. - source: <pull.1469.git.1674559397.gitgitgadget@gmail.com> + The implementation of the default "negotiator", used to find common + ancestor over the network for object tranfer, used to be recursive; + it was updated to be iterative to conserve stackspace usage. + cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com> + source: <cover.1682513384.git.hanxin.hx@bytedance.com> -* la/doc-interpret-trailers (2023-05-08) 11 commits - - doc: trailer: add more examples in DESCRIPTION - - doc: trailer: mention 'key' in DESCRIPTION - - doc: trailer.<token>.command: emphasize deprecation - - doc: trailer.<token>.command: refer to existing example - - doc: trailer: trailer.<token>.cmd: add missing verb phrase - - doc: trailer: use angle brackets for <token> and <value> - - doc: trailer: explain "commit mesage part" on first usage - - doc: trailer: remove redundant phrasing - - doc: trailer: --no-divider: more precise language - - doc: trailer: swap verb order - - doc: trailer: fix grammar +* ma/gittutorial-fixes (2023-04-20) 2 commits + (merged to 'next' on 2023-05-02 at bf96011972) + + gittutorial: wrap literal examples in backticks + + gittutorial: drop early mention of origin - Doc update. + Doc fixes. + source: <cover.1681579244.git.martin.agren@gmail.com> - Needs review. - source: <pull.1506.git.git.1683566870.gitgitgadget@gmail.com> +* mh/credential-oauth-refresh-token (2023-04-21) 1 commit + (merged to 'next' on 2023-05-04 at 9ade4aa024) + + credential: new attribute oauth_refresh_token -* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit - (merged to 'next' on 2023-05-09 at 7734f3d690) - + test: rev-parse-upstream: add missing cmp + The credential subsystem learns to help OAuth framework. + source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com> - Test fix. - Will merge to 'master'. - source: <20230509000246.1760327-1-felipe.contreras@gmail.com> +* mh/credential-password-expiry-wincred (2023-04-03) 1 commit + (merged to 'next' on 2023-05-06 at 51aae61f60) + + credential/wincred: store password_expiry_utc + Teach the recently invented "password expiry time" trait to the + wincred credential helper. + cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com> + source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com> -* cc/git-replay (2023-05-09) 16 commits - - SQUASH??? - - replay: stop assuming replayed branches do not diverge - - replay: add --contained to rebase contained branches - - replay: add --advance or 'cherry-pick' mode - - replay: disallow revision specific options and pathspecs - - replay: use standard revision ranges - - replay: make it a minimal server side command - - replay: remove HEAD related sanity check - - replay: remove progress and info output - - replay: add an important FIXME comment about gpg signing - - replay: don't simplify history - - replay: introduce pick_regular_commit() - - replay: die() instead of failing assert() - - replay: start using parse_options API - - replay: introduce new builtin - - t6429: remove switching aspects of fast-rebase - source: <20230509175347.1714141-1-christian.couder@gmail.com> +* mh/use-wincred-from-system (2023-03-27) 1 commit + (merged to 'next' on 2023-05-06 at a545c5d4aa) + + credential/wincred: include wincred.h + Code clean-up. + cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de> + cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com> + source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com> -* jc/pack-ref-exclude-include (2023-05-09) 3 commits - - pack-refs: teach pack-refs --include option - - pack-refs: teach --exclude option to exclude refs from being packed - - docs: clarify git-pack-refs --all will pack all refs - "git pack-refs" learns "--include" and "--exclude" to tweak the ref - hierarchy to be packed using pattern matching. - source: <pull.1501.v2.git.git.1683659931.gitgitgadget@gmail.com> +* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits + (merged to 'next' on 2023-05-03 at ba7079bcd4) + + send-email: expose header information to git-send-email's sendemail-validate hook + + send-email: refactor header generation functions + + "git send-email" learned to give the e-mail headers to the validate + hook by passing an extra argument from the command line. + source: <20230419202703.2911836-1-michael.strawbridge@amd.com> -* jk/test-verbose-no-more (2023-05-08) 3 commits - (merged to 'next' on 2023-05-09 at 897bfd0a6b) - + t: drop "verbose" helper function - + t7001: use "ls-files --format" instead of "cut" - + t7001: avoid git on upstream of pipe +* rs/test-ctype-eof (2023-05-02) 1 commit + (merged to 'next' on 2023-05-02 at a19201a6a9) + + test-ctype: check EOF - Retire "verbose" helper function from the test framework. + ctype tests have been taught to test EOF, too. + source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de> - Will merge to 'master'. - source: <20230508185953.GA2108869@coredump.intra.peff.net> + +* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit + (merged to 'next' on 2023-05-04 at a4b1b128d6) + + docs: clarify git rm --cached function in gitignore note + + Doc update. + source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com> + + +* tb/credential-long-lines (2023-05-01) 7 commits + (merged to 'next' on 2023-05-02 at f027002b92) + + contrib/credential: embiggen fixed-size buffer in wincred + + contrib/credential: avoid fixed-size buffer in libsecret + + contrib/credential: .gitignore libsecret build artifacts + + contrib/credential: remove 'gnome-keyring' credential helper + + contrib/credential: avoid fixed-size buffer in osxkeychain + + t/lib-credential.sh: ensure credential helpers handle long headers + + credential.c: store "wwwauth[]" values in `credential_read()` + + The implementation of credential helpers used fgets() over fixed + size buffers to read protocol messages, causing the remainder of + the folded long line to trigger unexpected behaviour, which has + been corrected. + source: <cover.1682956419.git.me@ttaylorr.com> -------------------------------------------------- [Stalled] @@ -384,20 +303,15 @@ Release tarballs are available at: source: <pull.1474.git.1675614276549.gitgitgadget@gmail.com> -* ab/tag-object-type-errors (2022-11-22) 5 commits +* ab/tag-object-type-errors (2023-05-10) 4 commits - tag: don't emit potentially incorrect "object is a X, not a Y" - tag: don't misreport type of tagged objects in errors - object tests: add test for unexpected objects in tags - - object-file.c: free the "t.tag" in check_tag() - Merge branch 'jk/parse-object-type-mismatch' into ab/tag-object-type-errors Hardening checks around mismatched object types when one of those objects is a tag. - - Expecting a reroll. - cf. <xmqqzgb5jz5c.fsf@gitster.g> - cf. <xmqqsfgxjugi.fsf@gitster.g> - source: <cover-0.4-00000000000-20221118T113442Z-avarab@gmail.com> + source: <cover-v2-0.3-00000000000-20221230T011725Z-avarab@gmail.com> * ad/test-record-count-when-harness-is-in-use (2022-12-25) 1 commit @@ -442,17 +356,15 @@ Release tarballs are available at: source: <cover-v2-0.6-00000000000-20230202T093706Z-avarab@gmail.com> -* tc/cat-file-z-use-cquote (2023-03-03) 2 commits - . cat-file: quote-format name in error when using -z - . cat-file: extract printing batch error message into function +* tc/cat-file-z-use-cquote (2023-05-10) 1 commit + - cat-file: quote-format name in error when using -z "cat-file" in the batch mode that is fed NUL-terminated pathnames learned to cquote them in its error output (otherwise, a funny pathname with LF in it would break the lines in the output stream). - Breaks "cat-file --batch-all-objects --batch-check". - cf. <xmqqilfhctrr.fsf@gitster.g> - source: <20230303191708.77894-1-toon@iotcl.com> + Will merge to 'next'? + source: <20230510190116.795641-2-toon@iotcl.com> * cw/submodule-status-in-parallel (2023-03-02) 6 commits @@ -474,38 +386,153 @@ Release tarballs are available at: -------------------------------------------------- [Cooking] -* fc/doc-drop-custom-callout-format (2023-05-03) 1 commit - (merged to 'next' on 2023-05-04 at c2fd654367) - + doc: remove custom callouts format +* jc/t9800-fix-use-of-show-s-raw (2023-05-06) 1 commit + (merged to 'next' on 2023-05-09 at f4d7a7d671) + + t9800: correct misuse of 'show -s --raw' in a test - Our custom callout formatter is no longer used in the documentation - formatting toolchain, as the upstream default ones give better - output these days. + A test fix. Will merge to 'master'. - source: <20230418011828.47851-1-felipe.contreras@gmail.com> + source: <xmqqild5rvvw.fsf@gitster.g> -* fc/doc-man-lift-title-length-limit (2023-05-03) 1 commit - (merged to 'next' on 2023-05-04 at d048eb1ef8) - + doc: manpage: remove maximum title length +* tl/push-branches-is-an-alias-for-all (2023-05-06) 1 commit + (merged to 'next' on 2023-05-09 at 1d8c3e5dcf) + + push: introduce '--branches' option - The titles of manual pages (formatted with AsciiDoc) used to be - chomped at unreasonably short limit, which has been removed; this - makes the formatted output match that of asciidoctor. + "git push --all" gained an alias "git push --branches". Will merge to 'master'. - source: <20230503171658.8996-1-felipe.contreras@gmail.com> + source: <20230506113408.61529-2-tenglong.tl@alibaba-inc.com> -* sd/doc-gitignore-and-rm-cached (2023-05-03) 1 commit - (merged to 'next' on 2023-05-04 at a4b1b128d6) - + docs: clarify git rm --cached function in gitignore note +* en/header-split-cache-h-part-3 (2023-05-08) 25 commits + - fsmonitor-ll.h: split this header out of fsmonitor.h + - hash-ll, hashmap: move oidhash() to hash-ll + - git-compat-util.h: remove unneccessary include of wildmatch.h + - builtin.h: remove unneccessary includes + - list-objects-filter-options.h: remove unneccessary include + - diff.h: remove unnecessary include of oidset.h + - repository: remove unnecessary include of path.h + - log-tree: replace include of revision.h with simple forward declaration + - cache.h: remove this no-longer-used header + - read-cache*.h: move declarations for read-cache.c functions from cache.h + - repository.h: move declaration of the_index from cache.h + - merge.h: move declarations for merge.c from cache.h + - diff.h: move declaration for global in diff.c from cache.h + - preload-index.h: move declarations for preload-index.c from elsewhere + - sparse-index.h: move declarations for sparse-index.c from cache.h + - name-hash.h: move declarations for name-hash.c from cache.h + - run-command.h: move declarations for run-command.c from cache.h + - statinfo: move stat_{data,validity} functions from cache/read-cache + - read-cache: move shared add/checkout/commit code + - add: modify add_files_to_cache() to avoid globals + - read-cache: move shared commit and ls-files code + - setup: adopt shared init-db & clone code + - init-db, clone: change unnecessary global into passed parameter + - init-db: remove unnecessary global variable & document existing bug + - Merge branch 'en/header-split-cache-h-part-2' into en/header-split-cache-h-part-3 + + Header files cleanup. + + Needs review. + source: <pull.1525.git.1683431149.gitgitgadget@gmail.com> + + +* js/subtree-fully-spelt-quiet-and-debug-options (2023-05-08) 1 commit + (merged to 'next' on 2023-05-10 at 2980db981e) + + subtree: support long global flags + + "git subtree" (in contrib/) update. + + Will merge to 'master'. + source: <pull.1514.git.1683428988693.gitgitgadget@gmail.com> + + +* js/gitk-fixes-from-gfw (2023-05-08) 3 commits + (merged to 'next' on 2023-05-08 at adb334deec) + + Merge gitk changes into js/gitk-fixes-from-gfw + + gitk: escape file paths before piping to git log + + gitk: prevent overly long command lines + + Gitk updates from GfW project. + + Will merge to 'master'. + source: <pull.1469.git.1674559397.gitgitgadget@gmail.com> + + +* la/doc-interpret-trailers (2023-05-11) 9 commits + - doc: trailer: add more examples in DESCRIPTION + - doc: trailer: mention 'key' in DESCRIPTION + - doc: trailer.<token>.command: emphasize deprecation + - doc: trailer: use angle brackets for <token> and <value> + - doc: trailer: remove redundant phrasing + - doc: trailer: examples: avoid the word "message" by itself + - doc: trailer: drop "commit message part" phrasing + - doc: trailer: swap verb order + - doc: trailer: fix grammar Doc update. + On hold. Looking good. + Want to be rebased once kh/doc-interpret-trailers-updates lands. + source: <pull.1506.v2.git.git.1683839975.gitgitgadget@gmail.com> + + +* ar/test-cleanup-unused-file-creation (2023-05-09) 1 commit + (merged to 'next' on 2023-05-09 at 7734f3d690) + + test: rev-parse-upstream: add missing cmp + + Test fix. + Will merge to 'master'. - source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com> + source: <20230509000246.1760327-1-felipe.contreras@gmail.com> + + +* cc/git-replay (2023-05-09) 16 commits + - SQUASH??? + - replay: stop assuming replayed branches do not diverge + - replay: add --contained to rebase contained branches + - replay: add --advance or 'cherry-pick' mode + - replay: disallow revision specific options and pathspecs + - replay: use standard revision ranges + - replay: make it a minimal server side command + - replay: remove HEAD related sanity check + - replay: remove progress and info output + - replay: add an important FIXME comment about gpg signing + - replay: don't simplify history + - replay: introduce pick_regular_commit() + - replay: die() instead of failing assert() + - replay: start using parse_options API + - replay: introduce new builtin + - t6429: remove switching aspects of fast-rebase + + source: <20230509175347.1714141-1-christian.couder@gmail.com> + + +* jc/pack-ref-exclude-include (2023-05-11) 4 commits + - pack-refs: teach pack-refs --include option + - revision: modify ref_exclusions to handle inclusions + - pack-refs: teach --exclude option to exclude refs from being packed + - docs: clarify git-pack-refs --all will pack all refs + + "git pack-refs" learns "--include" and "--exclude" to tweak the ref + hierarchy to be packed using pattern matching. + + Needs review. + source: <pull.1501.v3.git.git.1683828635.gitgitgadget@gmail.com> + + +* jk/test-verbose-no-more (2023-05-08) 3 commits + (merged to 'next' on 2023-05-09 at 897bfd0a6b) + + t: drop "verbose" helper function + + t7001: use "ls-files --format" instead of "cut" + + t7001: avoid git on upstream of pipe + + Retire "verbose" helper function from the test framework. + + Will merge to 'master'. + source: <20230508185953.GA2108869@coredump.intra.peff.net> * tb/pack-extra-cruft-tips (2023-05-03) 1 commit @@ -601,26 +628,15 @@ Release tarballs are available at: source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de> -* mh/use-wincred-from-system (2023-03-27) 1 commit - (merged to 'next' on 2023-05-06 at a545c5d4aa) - + credential/wincred: include wincred.h - - Code clean-up. - - Will merge to 'master'. - cf. <8511e030-8167-715c-5ed4-1646e6e9ef85@gmx.de> - cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com> - source: <pull.1496.git.1679707396407.gitgitgadget@gmail.com> - - * jc/attr-source-tree (2023-05-06) 1 commit - - attr: teach "--attr-source=<tree>" global option to "git" + (merged to 'next' on 2023-05-10 at cb94f4fba6) + + attr: teach "--attr-source=<tree>" global option to "git" "git --attr-source=<tree> cmd $args" is a new way to have any command to read attributes not from the working tree but from the given tree object. - Will merge to 'next'. + Will merge to 'master'. source: <pull.1470.v6.git.git.1683346530487.gitgitgadget@gmail.com> @@ -637,35 +653,6 @@ Release tarballs are available at: source: <20230501143848.19674-1-maxim.cournoyer@gmail.com> -* rs/test-ctype-eof (2023-05-02) 1 commit - (merged to 'next' on 2023-05-02 at a19201a6a9) - + test-ctype: check EOF - - ctype tests have been taught to test EOF, too. - - Will merge to 'master'. - source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de> - - -* tb/credential-long-lines (2023-05-01) 7 commits - (merged to 'next' on 2023-05-02 at f027002b92) - + contrib/credential: embiggen fixed-size buffer in wincred - + contrib/credential: avoid fixed-size buffer in libsecret - + contrib/credential: .gitignore libsecret build artifacts - + contrib/credential: remove 'gnome-keyring' credential helper - + contrib/credential: avoid fixed-size buffer in osxkeychain - + t/lib-credential.sh: ensure credential helpers handle long headers - + credential.c: store "wwwauth[]" values in `credential_read()` - - The implementation of credential helpers used fgets() over fixed - size buffers to read protocol messages, causing the remainder of - the folded long line to trigger unexpected behaviour, which has - been corrected. - - Will merge to 'master'. - source: <cover.1682956419.git.me@ttaylorr.com> - - * bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit - upload-pack: advertise capabilities when cloning empty repos @@ -700,7 +687,7 @@ Release tarballs are available at: source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com> -* cw/strbuf-cleanup (2023-05-08) 7 commits +* cw/strbuf-cleanup (2023-05-11) 7 commits - strbuf: remove global variable - strbuf: clarify dependency - path: move related function to path @@ -712,33 +699,8 @@ Release tarballs are available at: Move functions that are not about pure string manipulation out of strbuf.[ch] - Comments? - source: <20230508165728.525603-1-calvinwan@google.com> - - -* ah/doc-attributes-text (2023-05-03) 1 commit - (merged to 'next' on 2023-05-04 at 121c97817e) - + docs: rewrite the documentation of the text and eol attributes - - Doc update to clarify how text and eol attributes interact to - specify the end-of-line conversion. - - Will merge to 'master'. - source: <20230503044656.221175-2-alexhenrie24@gmail.com> - - -* hx/negotiator-non-recursive (2023-04-26) 2 commits - (merged to 'next' on 2023-05-02 at 64f97cc72d) - + negotiator/skipping: fix some problems in mark_common() - + negotiator/default: avoid stack overflow - - The implementation of the default "negotiator", used to find common - ancestor over the network for object tranfer, used to be recursive; - it was updated to be iterative to conserve stackspace usage. - - Will merge to 'master'. - cf. <9ad5f246-e21f-0a13-1a53-1ae3307c3f0e@github.com> - source: <cover.1682513384.git.hanxin.hx@bytedance.com> + Will merge to 'next'? + source: <20230511194446.1492907-1-calvinwan@google.com> * jc/doc-clarify-git-default-hash-variable (2023-04-26) 1 commit @@ -819,12 +781,13 @@ Release tarballs are available at: source: <20230423134649.431783-1-rybak.a.v@gmail.com> -* ps/fetch-output-format (2023-05-09) 8 commits +* ps/fetch-output-format (2023-05-10) 9 commits - fetch: introduce machine-parseable "porcelain" output format - fetch: move option related variables into main function - - fetch: move display format parsing into main function + - fetch: lift up parsing of "fetch.output" config variable - fetch: introduce `display_format` enum - - fetch: fix missing from-reference when fetching HEAD:foo + - fetch: refactor calculation of the display table width + - fetch: print left-hand side when fetching HEAD:foo - fetch: add a test to exercise invalid output formats - fetch: split out tests for output format - fetch: fix `--no-recurse-submodules` with multi-remote fetches @@ -832,38 +795,17 @@ Release tarballs are available at: "git fetch" learned the "--porcelain" option that emits what it did in a machine-parseable format. - Getting there. - source: <cover.1683636885.git.ps@pks.im> - - -* ma/gittutorial-fixes (2023-04-20) 2 commits - (merged to 'next' on 2023-05-02 at bf96011972) - + gittutorial: wrap literal examples in backticks - + gittutorial: drop early mention of origin - - Doc fixes. - - Will merge to 'master'. - source: <cover.1681579244.git.martin.agren@gmail.com> + Will merge to 'next'? + source: <cover.1683721293.git.ps@pks.im> * sg/retire-unused-cocci (2023-04-20) 1 commit - cocci: remove 'unused.cocci' Retire a rather expensive-to-run Coccinelle check patch. - source: <20230420205350.600760-1-szeder.dev@gmail.com> - - -* ms/send-email-feed-header-to-validate-hook (2023-04-19) 2 commits - (merged to 'next' on 2023-05-03 at ba7079bcd4) - + send-email: expose header information to git-send-email's sendemail-validate hook - + send-email: refactor header generation functions - - "git send-email" learned to give the e-mail headers to the validate - hook by passing an extra argument from the command line. - Will merge to 'master'. - source: <20230419202703.2911836-1-michael.strawbridge@amd.com> + Will merge to 'next'. + source: <20230420205350.600760-1-szeder.dev@gmail.com> * gc/doc-cocci-updates (2023-04-27) 2 commits @@ -905,44 +847,6 @@ Release tarballs are available at: source: <pull.1515.git.1681495119.gitgitgadget@gmail.com> -* ar/test-cleanup-unused-file-creation-part2 (2023-05-03) 6 commits - (merged to 'next' on 2023-05-03 at 185f0ec195) - + 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 'master'. - cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com> - source: <20230417191044.909094-1-rybak.a.v@gmail.com> - - -* mh/credential-password-expiry-wincred (2023-04-03) 1 commit - (merged to 'next' on 2023-05-06 at 51aae61f60) - + credential/wincred: store password_expiry_utc - - Teach the recently invented "password expiry time" trait to the - wincred credential helper. - - Will merge to 'master'. - cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com> - source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com> - - -* mh/credential-oauth-refresh-token (2023-04-21) 1 commit - (merged to 'next' on 2023-05-04 at 9ade4aa024) - + credential: new attribute oauth_refresh_token - - The credential subsystem learns to help OAuth framework. - - Will merge to 'master'. - source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com> - - * mh/credential-password-expiry-libsecret (2023-05-05) 1 commit (merged to 'next' on 2023-05-09 at fd898e3756) + credential/libsecret: support password_expiry_utc @@ -960,7 +864,8 @@ Release tarballs are available at: Teach "diff-files" not to expand sparse-index unless needed. - Will merge to 'next'? + Will merge to 'next'. + cf. <f51a8d77-c480-f021-38c4-78a9d75cdd11@github.com> source: <20230509194241.469477-1-cheskaqiqi@gmail.com> |