summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2023-05-05 15:48:39 -0700
committerJunio C Hamano <gitster@pobox.com>2023-05-05 15:48:39 -0700
commit05aa2dcf4a6fcbf2c3ea474d692ab6943c6284e4 (patch)
treef854c5371d9b073d546fdd07f904396bdd42b5a2
parent860208a52f24159c235c7b4acee616b1873d1242 (diff)
downloadgit-05aa2dcf4a6fcbf2c3ea474d692ab6943c6284e4.tar.gz
What's cooking (2023/05 #02)
-rw-r--r--whats-cooking.txt559
1 files changed, 318 insertions, 241 deletions
diff --git a/whats-cooking.txt b/whats-cooking.txt
index a76e476412..c200a8d107 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, #01; Tue, 2)
+Subject: What's cooking in git.git (May 2023, #02; Fri, 5)
X-master-at: 69c786637d7a7fe3b2b8f7d989af095f5f49c3a8
-X-next-at: 97c42697076c706727900ce04889b69df0880a16
+X-next-at: a4b1b128d6e6f4cf1ab6838085988181581b2791
Bcc: lwn@lwn.net, gitster@pobox.com
-What's cooking in git.git (May 2023, #01; Tue, 2)
+What's cooking in git.git (May 2023, #02; Fri, 5)
--------------------------------------------------
Here are the topics that have been cooking in my tree. Commits
@@ -45,171 +45,174 @@ Release tarballs are available at:
https://www.kernel.org/pub/software/scm/git/
--------------------------------------------------
-[Graduated to 'master']
+[New Topics]
-* ek/completion-use-read-r-to-read-literally (2023-04-20) 1 commit
- (merged to 'next' on 2023-04-24 at 25bf3b808b)
- + completion: suppress unwanted unescaping of `read`
+* 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
- The completion script used to use bare "read" without the "-r"
- option to read the contents of various state files, which risked
- getting confused with backslashes in them. This has been
- corrected.
- source: <20230420223800.1698197-1-myoga.murase@gmail.com>
+ Our custom callout formatter is no longer used in the documentation
+ formatting toolchain, as the upstream default ones give better
+ output these days.
+ Will merge to 'master'.
+ source: <20230418011828.47851-1-felipe.contreras@gmail.com>
-* en/ort-finalize-after-0-merges-fix (2023-04-24) 1 commit
- (merged to 'next' on 2023-04-25 at 1bc935225b)
- + merge-ort: fix calling merge_finalize() with no intermediate merge
- A small API fix to the ort merge strategy backend.
- source: <pull.1518.v2.git.1682194930766.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 (formatted with AsciiDoc) used to be
+ chomped at unreasonably short limit, which has been removed; this
+ makes the formatted output match that of asciidoctor.
-* jk/blame-fake-commit-label (2023-04-24) 1 commit
- (merged to 'next' on 2023-04-26 at 85226d9501)
- + blame: use different author name for fake commit generated by --contents
+ Will merge to 'master'.
+ source: <20230503171658.8996-1-felipe.contreras@gmail.com>
- The output given by "git blame" that attributes a line to contents
- taken from the file specified by the "--contents" option shows it
- differently from a line attributed to the working tree file.
- source: <20230424193508.2245566-1-jacob.e.keller@intel.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
-* jk/misc-null-check-fixes (2023-04-24) 2 commits
- (merged to 'next' on 2023-04-26 at 9500384e9d)
- + fetch_bundle_uri(): drop pointless NULL check
- + notes: clean up confusing NULL checks in init_notes()
+ Doc update.
- Code clean-up.
- source: <20230422135455.GA3942740@coredump.intra.peff.net>
+ Will merge to 'master'.
+ source: <pull.862.v3.git.git.1683150400953.gitgitgadget@gmail.com>
-* tb/ban-strtok (2023-04-27) 6 commits
- (merged to 'next' on 2023-04-27 at cbbfa4a609)
- + banned.h: mark `strtok()` and `strtok_r()` as banned
- + t/helper/test-json-writer.c: avoid using `strtok()`
- + t/helper/test-oidmap.c: avoid using `strtok()`
- + t/helper/test-hashmap.c: avoid using `strtok()`
- + string-list: introduce `string_list_setlen()`
- + string-list: multi-delimiter `string_list_split_in_place()`
+* tb/pack-extra-cruft-tips (2023-05-03) 1 commit
+ - builtin/pack-objects.c: introduce `pack.extraCruftTips`
- Mark strtok() and strtok_r() to be banned.
- source: <cover.1682374789.git.me@ttaylorr.com>
+ "git pack-objects" learned to invoke a new hook program that
+ enumerates extra objects to be used as anchoring points to keep
+ otherwise unreachable objects in cruft packs.
---------------------------------------------------
-[New Topics]
+ Under discussion
+ cf. <20230505221921.GE3321533@coredump.intra.peff.net>
+ source: <27a7f16aab35b5cac391d9831aadb0f2e2146313.1683151485.git.me@ttaylorr.com>
-* jc/attr-source-tree (2023-05-01) 1 commit
- - 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.
+* jc/diff-s-with-other-options (2023-05-05) 1 commit
+ - diff: fix interaction between the "-s" option and other options
+ (this branch uses jc/dirstat-plug-leaks.)
+
+ The "-s" (silent, squelch) option of the "diff" family of commands
+ did not interact with other options that specify the output format
+ well. This has been cleaned up so that it will clear all the
+ formatting options given before.
Will merge to 'next'?
- source: <pull.1470.v4.git.git.1682822352360.gitgitgadget@gmail.com>
+ source: <20230505165952.335256-1-gitster@pobox.com>
+* fc/asciidoc-code-block-hack (2023-05-04) 2 commits
+ - doc: manpage: remove ancient workaround
+ - doc: git-svn: use listing instead of verse
-* mc/send-email-header-cmd (2023-05-01) 3 commits
- - send-email: detect empty blank lines in command output
- - send-email: add --header-cmd, --no-header-cmd options
- - send-email: extract execute_cmd from recipients_cmd
+ Documentation toolchain lost an ancient workaround that is no
+ longer needed.
- "git send-email" learned "--header-cmd=<cmd>" that can inject
- arbitrary e-mail header lines to the outgoing messages.
+ Needs review.
+ source: <20230504035517.329765-1-felipe.contreras@gmail.com>
- Will merge to 'next'?
- source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
+* fc/doc-revisions-markup-fix (2023-05-04) 2 commits
+ - doc: revisions: add a bunch of missing quotes
+ - doc: revisions: fix missing escape
-* 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
+ Doc cleanup.
- Retitle a test script with an overly narrow name.
+ Needs review.
+ source: <20230504163421.100400-1-felipe.contreras@gmail.com>
- Will merge to 'master'.
- source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
+* fc/doc-use-datestamp-in-commit (2023-05-05) 2 commits
+ - doc-diff: drop SOURCE_DATE_EPOCH override
+ - doc: doc-diff: specify date
-* rs/test-ctype-eof (2023-05-02) 1 commit
- (merged to 'next' on 2023-05-02 at a19201a6a9)
- + test-ctype: check EOF
+ An earlier change broke "doc-diff", which has been corrected.
- ctype tests have been taught to test EOF, too.
+ Will merge to 'next'.
+ source: <20230503232349.59997-1-felipe.contreras@gmail.com>
+ source: <20230505211610.GA3197168@coredump.intra.peff.net>
- Will merge to 'master'.
- source: <1dbbd7ce-2b3f-6f88-f902-1d4ffe62e259@web.de>
+* jc/dirstat-plug-leaks (2023-05-05) 2 commits
+ - diff: plug leaks in dirstat
+ - diff: refactor common tail part of dirstat computation
+ (this branch is used by jc/diff-s-with-other-options.)
-* 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()`
+ "git diff --dirstat" leaked memory, which has been plugged.
- 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 'next'?
+ source: <20230505211917.2746751-1-gitster@pobox.com>
- Will merge to 'master'.
- source: <cover.1682956419.git.me@ttaylorr.com>
+* jc/name-rev-deprecate-stdin-further (2023-05-05) 1 commit
+ - name-rev: make --stdin hidden
-* bc/clone-empty-repo-via-protocol-v0 (2023-05-01) 1 commit
- - upload-pack: advertise capabilities when cloning empty repos
+ The "--stdin" option of "git name-rev" has been replaced with
+ the "--annotate-stdin" option more than a year ago. We stop
+ advertising it in the "git name-rev -h" output.
- Expecting a minor and hopefully final update.
- cf. <20230501224038.GA1174291@coredump.intra.peff.net>
- source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
+ Expecting a reroll.
+ source: <pull.1225.v2.git.git.1683314270964.gitgitgadget@gmail.com>
+--------------------------------------------------
+[Stalled]
-* ds/fsck-bitmap (2023-05-02) 2 commits
- - fsck: use local repository
- - fsck: verify checksums of all .bitmap files
+* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
+ - fsmonitor: handle differences between Windows named pipe functions
- "git fsck" learned to detect bit-flip breakages in the reachability
- bitmap files.
+ Fix fsmonitor on Windows when the filesystem path contains certain
+ characters.
- Will merge to 'master'.
- source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
+ Expecting a reroll.
+ cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
+ source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
-* gc/trace-bare-repo-setup (2023-05-01) 1 commit
- - setup: trace bare repository setups
+* rn/sparse-diff-index (2023-04-10) 1 commit
+ - diff-index: enable sparse index
- The tracing mechanism learned to notice and report when
- auto-discovered bare repositories are being used, as allowing so
- without explicitly stating the user intends to do so (with setting
- GIT_DIR for example) can be used with social engineering as an
- attack vector.
+ "git diff-index" command has been taught to work better with the
+ sparse index.
- Will merge to 'next'?
- source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
+ Expecting a reroll.
+ cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
+ source: <20230408112342.404318-1-nanth.raghul@gmail.com>
-* cw/strbuf-cleanup (2023-05-02) 6 commits
- - strbuf: remove environment variables
- - strbuf: clarify dependency
- - path: move related function to path
- - object-name: move related functions to object-name
- - credential-store: move related functions to credential-store file
- - abspath: move related functions to abspath
+* ja/worktree-orphan (2023-04-17) 8 commits
+ - worktree add: emit warn when there is a bad HEAD
+ - worktree add: extend DWIM to infer --orphan
+ - worktree add: introduce "try --orphan" hint
+ - worktree add: add --orphan flag
+ - t2400: add tests to verify --quiet
+ - t2400: refactor "worktree add" opt exclusion tests
+ - t2400: print captured git output when finished
+ - worktree add: include -B in usage docs
- Move functions that are not about pure string manipulation out of
- strbuf.[ch]
+ 'git worktree add' learned how to create a worktree based on an
+ orphaned branch with `--orphan`.
- Comments?
- source: <20230502211454.1673000-1-calvinwan@google.com>
+ Expecting a reroll.
+ cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
+ source: <20230417093255.31079-1-jacobabel@nullpo.dev>
+
+
+* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
+ - usage: clarify --recurse-submodules as a boolean
+
+ The "--[no-]recurse-submodules" option of "git checkout" and others
+ supported an undocumented syntax --recurse-submodules=<value> where
+ the value can spell a Boolean in various ways. The support for the
+ syntax is being dropped.
+
+ Expecting a reroll.
+ cf. <ZDSTFwMFO7vbj/du@google.com>
+ source: <ZDSTFwMFO7vbj/du@google.com>
---------------------------------------------------
-[Stalled]
* tb/pack-bitmap-index-seek (2023-03-20) 6 commits
- pack-bitmap.c: factor out `bitmap_index_seek_commit()`
@@ -226,17 +229,6 @@ Release tarballs are available at:
source: <cover.1679342296.git.me@ttaylorr.com>
-* mh/use-wincred-from-system (2023-03-27) 1 commit
- - credential/wincred: include wincred.h
-
- Code clean-up.
-
- Will merge to 'next'?
- 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>
-
-
* 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
@@ -249,17 +241,6 @@ Release tarballs are available at:
source: <20230120113553.24655-1-carenas@gmail.com>
-* ob/revert-of-revert (2023-05-01) 1 commit
- - sequencer: beautify subject of reverts of reverts
-
- Instead of "Revert "Revert "original"", give "Replay "original""
- as the title for a revert of a revert.
-
- Expecting a hopefully final reroll.
- Looking much better, except for minor cosmetic issues.
- source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
-
-
* tk/pull-conflict-suggest-rebase-merge-not-rebase-true (2023-02-13) 1 commit
- pull: conflict hint pull.rebase suggestion should offer "merges" vs "true"
@@ -365,14 +346,148 @@ Release tarballs are available at:
--------------------------------------------------
[Cooking]
-* ah/doc-attributes-text (2023-05-01) 1 commit
- - docs: rewrite the documentation of the text and eol attributes
+* ob/revert-of-revert (2023-05-05) 1 commit
+ - sequencer: beautify subject of reverts of reverts
+
+ Instead of "Revert "Revert "original"", give "Replay "original""
+ as the title for a revert of a revert.
+
+ Expecting a hopefully final reroll.
+ Looking much better, except for minor cosmetic issues.
+ source: <20230428083528.1699221-1-oswald.buddenhagen@gmx.de>
+
+
+* mh/use-wincred-from-system (2023-03-27) 1 commit
+ - credential/wincred: include wincred.h
+
+ Code clean-up.
+
+ Will merge to 'next'.
+ 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-03) 1 commit
+ - 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.
+
+ Expecting a hopefully final minor reroll.
+ cf. <CAP8UFD1AuFWWC=iAe0duhpSsw9HnA-tcpV2F3NGT+089aY60Ow@mail.gmail.com>
+ source: <pull.1470.v5.git.git.1683144574158.gitgitgadget@gmail.com>
+
+
+* mc/send-email-header-cmd (2023-05-01) 3 commits
+ - send-email: detect empty blank lines in command output
+ - send-email: add --header-cmd, --no-header-cmd options
+ - send-email: extract execute_cmd from recipients_cmd
+
+ "git send-email" learned "--header-cmd=<cmd>" that can inject
+ arbitrary e-mail header lines to the outgoing messages.
+
+ Will merge to 'next'.
+ source: <20230501143848.19674-1-maxim.cournoyer@gmail.com>
+
+
+* 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.
+
+ Will merge to 'master'.
+ source: <20230430100034.1889796-1-oswald.buddenhagen@gmx.de>
+
+
+* 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
+
+ Expecting a minor and hopefully final update.
+ cf. <20230501224038.GA1174291@coredump.intra.peff.net>
+ source: <20230501170018.1410567-2-sandals@crustytoothpaste.net>
+
+
+* ds/fsck-bitmap (2023-05-02) 2 commits
+ - fsck: use local repository
+ - fsck: verify checksums of all .bitmap files
+
+ "git fsck" learned to detect bit-flip breakages in the reachability
+ bitmap files.
+
+ Will merge to 'master'.
+ source: <pull.1526.v2.git.1683034042.gitgitgadget@gmail.com>
+
+
+* gc/trace-bare-repo-setup (2023-05-01) 1 commit
+ - setup: trace bare repository setups
+
+ The tracing mechanism learned to notice and report when
+ auto-discovered bare repositories are being used, as allowing so
+ without explicitly stating the user intends to do so (with setting
+ GIT_DIR for example) can be used with social engineering as an
+ attack vector.
+
+ Will merge to 'next'.
+ source: <e98be8e7f703fc741e06d9208545abc8c24d1a4a.1682962110.git.steadmon@google.com>
+
+
+* cw/strbuf-cleanup (2023-05-03) 7 commits
+ - strbuf: remove environment variables
+ - strbuf: clarify dependency
+ - path: move related function to path
+ - object-name: move related functions to object-name
+ - credential-store: move related functions to credential-store file
+ - abspath: move related functions to abspath
+ - strbuf: clarify API boundary
+
+ Move functions that are not about pure string manipulation out of
+ strbuf.[ch]
+
+ Comments?
+ source: <20230503184849.1809304-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 'next'?
- source: <20230501023533.35370-2-alexhenrie24@gmail.com>
+ Will merge to 'master'.
+ source: <20230503044656.221175-2-alexhenrie24@gmail.com>
* jw/send-email-update-gmail-insn (2023-04-28) 1 commit
@@ -429,7 +544,7 @@ Release tarballs are available at:
GIT_DEFAULT_HASH and "git clone", which has been clarified to
stress that the variable is to be ignored by the command.
- Will merge to 'next'?
+ Will merge to 'next'.
source: <xmqqzg6uvfpo.fsf_-_@gitster.g>
@@ -458,8 +573,7 @@ Release tarballs are available at:
'git notes append' was taught '--separator' to specify string to insert
between paragraphs.
- Will merge to 'next'?
- Looking good.
+ Will merge to 'next'.
source: <cover.1682671758.git.dyroneteng@gmail.com>
@@ -474,7 +588,9 @@ Release tarballs are available at:
Various fixes to the behaviour of "rebase -i" when the command got
interrupted by conflicting changes.
- Needs review.
+ Expecting a reroll.
+ cf. <xmqqsfcthrpb.fsf@gitster.g>
+ cf. <1fd54422-b66a-c2e4-7cd7-934ea01190ad@gmail.com>
source: <pull.1492.v2.git.1682089074.gitgitgadget@gmail.com>
@@ -498,20 +614,23 @@ Release tarballs are available at:
Fix-up to a topic already graduated to 'master'.
- Iffy.
+ Expecting a reroll.
+ cf. <20230423071243.1863977-1-cheskaqiqi@gmail.com>
source: <20230423071243.1863977-1-cheskaqiqi@gmail.com>
-* tb/pack-bitmap-traversal-with-boundary (2023-04-25) 3 commits
+* tb/pack-bitmap-traversal-with-boundary (2023-05-05) 2 commits
- pack-bitmap.c: use commit boundary during bitmap traversal
- pack-bitmap.c: extract `fill_in_bitmap()`
- - revision: support tracking uninteresting commits
The object traversal using reachability bitmap done by
"pack-object" has been tweaked to take advantage of the fact that
using "boundary" commits as representative of all the uninteresting
ones can save quite a lot of object enumeration.
- source: <cover.1682380788.git.me@ttaylorr.com>
+
+ Under discussion.
+ cf. <4ce3ff5f-e7cd-f604-f5da-66939be7d314@github.com>
+ source: <cover.1683307620.git.me@ttaylorr.com>
* ar/config-count-tests-updates (2023-04-24) 3 commits
@@ -520,6 +639,8 @@ Release tarballs are available at:
- t1300: drop duplicate test
Test updates.
+
+ Will merge to 'next'.
source: <20230423134649.431783-1-rybak.a.v@gmail.com>
@@ -554,21 +675,21 @@ Release tarballs are available at:
source: <pull.1517.v2.git.1682194649.gitgitgadget@gmail.com>
-* ps/fetch-output-format (2023-04-27) 8 commits
+* ps/fetch-output-format (2023-05-03) 8 commits
- fetch: introduce machine-parseable "porcelain" output format
- - fetch: introduce new `--output-format` option
- fetch: move option related variables into main function
- fetch: move display format parsing into main function
- fetch: introduce `display_format` enum
- fetch: fix missing from-reference 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
"git fetch" learned the "--output-format" option that emits what it
did in a machine-parseable format.
- Expecting a review response.
- source: <cover.1682593865.git.ps@pks.im>
+ Will merge to 'next'?
+ source: <cover.1683113177.git.ps@pks.im>
* ma/gittutorial-fixes (2023-04-20) 2 commits
@@ -585,43 +706,30 @@ Release tarballs are available at:
* 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
- - send-email: expose header information to git-send-email's sendemail-validate hook
- - send-email: refactor header generation functions
+ (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 'next'.
+ Will merge to 'master'.
source: <20230419202703.2911836-1-michael.strawbridge@amd.com>
-* ja/worktree-orphan (2023-04-17) 8 commits
- - worktree add: emit warn when there is a bad HEAD
- - worktree add: extend DWIM to infer --orphan
- - worktree add: introduce "try --orphan" hint
- - worktree add: add --orphan flag
- - t2400: add tests to verify --quiet
- - t2400: refactor "worktree add" opt exclusion tests
- - t2400: print captured git output when finished
- - worktree add: include -B in usage docs
-
- 'git worktree add' learned how to create a worktree based on an
- orphaned branch with `--orphan`.
-
- Expecting a reroll.
- cf. <m7crhly2j3k76whydbtdwhvzghvoql436g3lqtst4v3ahv75aa@wq5zjepgrxz5>
- source: <20230417093255.31079-1-jacobabel@nullpo.dev>
-
-
* gc/doc-cocci-updates (2023-04-27) 2 commits
- cocci: codify authoring and reviewing practices
- cocci: add headings to and reword README
Update documentation regarding Coccinelle patches.
+
+ Will merge to 'next'?
source: <pull.1495.v2.git.git.1682634143.gitgitgadget@gmail.com>
@@ -633,7 +741,7 @@ Release tarballs are available at:
Doc update.
- Will merge to 'next'?
+ Will merge to 'next'.
source: <cover.1682970213.git.code@khaugsbakk.name>
@@ -653,104 +761,62 @@ Release tarballs are available at:
source: <pull.1515.git.1681495119.gitgitgadget@gmail.com>
-* rn/sparse-diff-index (2023-04-10) 1 commit
- - diff-index: enable sparse index
-
- "git diff-index" command has been taught to work better with the
- sparse index.
-
- Expecting a reroll.
- cf. <62821012-4fc3-5ad8-695c-70f7ab14a8c9@github.com>
- source: <20230408112342.404318-1-nanth.raghul@gmail.com>
-
-
-* es/recurse-submodules-option-is-a-bool (2023-04-10) 1 commit
- - usage: clarify --recurse-submodules as a boolean
-
- The "--[no-]recurse-submodules" option of "git checkout" and others
- supported an undocumented syntax --recurse-submodules=<value> where
- the value can spell a Boolean in various ways. The support for the
- syntax is being dropped.
-
- Expecting a reroll.
- cf. <ZDSTFwMFO7vbj/du@google.com>
- source: <ZDSTFwMFO7vbj/du@google.com>
-
-
-* ar/test-cleanup-unused-file-creation-part2 (2023-04-17) 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
+* 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.
- Comments?
+ Will merge to 'master'.
+ cf. <CABPp-BFCBPTBc9savP13gNFmBo_WCnZHUv_Z8bWE6T6GZOrs-Q@mail.gmail.com>
source: <20230417191044.909094-1-rybak.a.v@gmail.com>
-* ed/fsmonitor-windows-named-pipe (2023-03-24) 1 commit
- - fsmonitor: handle differences between Windows named pipe functions
-
- Fix fsmonitor on Windows when the filesystem path contains certain
- characters.
-
- Expecting a reroll.
- cf. <b9cf67e4-22a7-2ff0-8310-9223bea10d6d@jeffhostetler.com>
- source: <pull.1503.git.1679678090412.gitgitgadget@gmail.com>
-
-
* mh/credential-password-expiry-wincred (2023-04-03) 1 commit
- credential/wincred: store password_expiry_utc
Teach the recently invented "password expiry time" trait to the
wincred credential helper.
- Will merge to 'next'?
+ Will merge to 'next'.
cf. <CAGJzqsm4LmpYE46v2=y4=A+Och44zaQyzTXQRteX-KNSzA_18g@mail.gmail.com>
source: <pull.1477.v3.git.git.1680508028077.gitgitgadget@gmail.com>
-* nw/for-each-ref-signature (2023-03-13) 1 commit
- . ref-filter: add new "signature" atom
-
- "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
- placeholder and friends.
-
- Breaks CI.
- cf. <xmqqpm9bosjw.fsf@gitster.g>
- source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>
-
-
* mh/credential-oauth-refresh-token (2023-04-21) 1 commit
- - credential: new attribute oauth_refresh_token
+ (merged to 'next' on 2023-05-04 at 9ade4aa024)
+ + credential: new attribute oauth_refresh_token
The credential subsystem learns to help OAuth framework.
- Needs Review.
+ Will merge to 'master'.
source: <pull.1394.v2.git.1682070479816.gitgitgadget@gmail.com>
-* mh/credential-password-expiry-libsecret (2023-03-27) 1 commit
+* mh/credential-password-expiry-libsecret (2023-05-05) 1 commit
- credential/libsecret: support password_expiry_utc
The libsecret credential helper learns to handle the password
expiry time information.
- Needs Review.
- source: <pull.1469.v2.git.git.1679729764851.gitgitgadget@gmail.com>
+ Will merge to 'next'?
+ source: <pull.1469.v3.git.git.1683270298313.gitgitgadget@gmail.com>
-* sl/diff-files-sparse (2023-05-02) 2 commits
+* sl/diff-files-sparse (2023-05-03) 2 commits
- diff-files: integrate with sparse index
- t1092: add tests for `git diff-files`
Teach "diff-files" not to expand sparse-index unless needed.
- Will merge to 'next'?
- source: <20230502172335.478312-1-cheskaqiqi@gmail.com>
+ Expecting a hopefully minor and final reroll.
+ cf. <xmqqpm7hm1yy.fsf@gitster.g>
+ source: <20230503215549.511999-1-cheskaqiqi@gmail.com>
* rj/branch-unborn-in-other-worktrees (2023-03-27) 5 commits
@@ -763,7 +829,7 @@ Release tarballs are available at:
Error messages given when working on an unborn branch that is
checked out in another worktree have been improved.
- Will merge to 'next'?
+ Will merge to 'next'.
source: <f8e6447e-5cd3-98fa-f567-39e1c60dacb0@gmail.com>
--------------------------------------------------
@@ -809,3 +875,14 @@ Release tarballs are available at:
Discarded without prejudice after more than 6 weeks of inactivity.
source: <20230228185253.2356546-1-calvinwan@google.com>
+
+
+* nw/for-each-ref-signature (2023-03-13) 1 commit
+ . ref-filter: add new "signature" atom
+
+ "git (for-each-ref|branch|tag) --format=<format>" learns the "%(signature)"
+ placeholder and friends.
+
+ Breaks CI.
+ cf. <xmqqpm9bosjw.fsf@gitster.g>
+ source: <20230311210607.64927-2-nsengiyumvawilberforce@gmail.com>