mirror of
https://github.com/git/git.git
synced 2026-01-24 07:47:20 +09:00
What's cooking (2024/03 #08)
This commit is contained in:
Junio C Hamano
parent
3701f6fa8c
commit
567bbef5cf
@ -1,10 +1,10 @@
|
||||
To: git@vger.kernel.org
|
||||
Subject: What's cooking in git.git (Mar 2024, #07; Fri, 22)
|
||||
X-master-at: 11c821f2f2a31e70fb5cc449f9a29401c333aad2
|
||||
X-next-at: 2796f347adbd255e43ba5d93f092851042834c28
|
||||
Subject: What's cooking in git.git (Mar 2024, #08; Tue, 26)
|
||||
X-master-at: c75fd8d8150afdf836b63a8e0534d9b9e3e111ba
|
||||
X-next-at: e103d9ffe4204bcd16a16bb8522827b4e6855422
|
||||
Bcc: lwn@lwn.net, gitster@pobox.com
|
||||
|
||||
What's cooking in git.git (Mar 2024, #07; Fri, 22)
|
||||
What's cooking in git.git (Mar 2024, #08; Tue, 26)
|
||||
--------------------------------------------------
|
||||
|
||||
Here are the topics that have been cooking in my tree. Commits
|
||||
@ -48,153 +48,222 @@ Release tarballs are available at:
|
||||
--------------------------------------------------
|
||||
[Graduated to 'master']
|
||||
|
||||
* bb/iso-strict-utc (2024-03-13) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at d2ac616873)
|
||||
+ date: make "iso-strict" conforming for the UTC timezone
|
||||
* bb/sh-scripts-cleanup (2024-03-16) 22 commits
|
||||
(merged to 'next' on 2024-03-18 at 4501a04796)
|
||||
+ git-quiltimport: avoid an unnecessary subshell
|
||||
+ contrib/coverage-diff: avoid redundant pipelines
|
||||
+ t/t9*: merge "grep | sed" pipelines
|
||||
+ t/t8*: merge "grep | sed" pipelines
|
||||
+ t/t5*: merge a "grep | sed" pipeline
|
||||
+ t/t4*: merge a "grep | sed" pipeline
|
||||
+ t/t3*: merge a "grep | awk" pipeline
|
||||
+ t/t1*: merge a "grep | sed" pipeline
|
||||
+ t/t9*: avoid redundant uses of cat
|
||||
+ t/t8*: avoid redundant use of cat
|
||||
+ t/t7*: avoid redundant use of cat
|
||||
+ t/t6*: avoid redundant uses of cat
|
||||
+ t/t5*: avoid redundant uses of cat
|
||||
+ t/t4*: avoid redundant uses of cat
|
||||
+ t/t3*: avoid redundant uses of cat
|
||||
+ t/t1*: avoid redundant uses of cat
|
||||
+ t/t0*: avoid redundant uses of cat
|
||||
+ t/perf: avoid redundant use of cat
|
||||
+ t/annotate-tests.sh: avoid redundant use of cat
|
||||
+ t/lib-cvs.sh: avoid redundant use of cat
|
||||
+ contrib/subtree/t: avoid redundant use of cat
|
||||
+ doc: avoid redundant use of cat
|
||||
|
||||
The output format for dates "iso-strict" has been tweaked to show
|
||||
a time in the Zulu timezone with "Z" suffix, instead of "+00:00".
|
||||
source: <20240313225423.11373-1-dev+git@drbeat.li>
|
||||
Shell scripts clean-up.
|
||||
source: <20240315194620.10713-1-dev+git@drbeat.li>
|
||||
|
||||
|
||||
* bb/t0006-negative-tz-offset (2024-03-14) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at 3f4751b6b2)
|
||||
+ t0006: add more tests with a negative TZ offset
|
||||
* bl/doc-config-fixes (2024-03-16) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at a9038d5a9e)
|
||||
+ docs: fix typo in git-config `--default`
|
||||
+ docs: clarify file options in git-config `--edit`
|
||||
|
||||
More tests on showing time with negative TZ offset.
|
||||
source: <20240314085512.1827031-1-dev+git@drbeat.li>
|
||||
A few typoes in "git config --help" have been corrected.
|
||||
source: <20240316050149.1182867-2-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
* dg/user-manual-hash-example (2024-03-12) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at 767800d3a7)
|
||||
+ Documentation/user-manual.txt: example for generating object hashes
|
||||
* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at b2e1babb85)
|
||||
+ docs: adjust trailer `separator` and `key_value_separator` language
|
||||
+ docs: correct trailer `key_value_separator` description
|
||||
|
||||
User manual (the original one) update.
|
||||
source: <20240312104238.4920-2-dirk@gouders.net>
|
||||
The documentation for "%(trailers[:options])" placeholder in the
|
||||
"--pretty" option of commands in the "git log" family has been
|
||||
updated.
|
||||
source: <20240316035612.752910-1-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
* fs/find-end-of-log-message-fix (2024-03-07) 1 commit
|
||||
(merged to 'next' on 2024-03-13 at 2bed63caaf)
|
||||
+ wt-status: don't find scissors line beyond buf len
|
||||
* ja/doc-formatting-fix (2024-03-16) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at edde7a576d)
|
||||
+ doc: fix some placeholders formating
|
||||
+ doc: format alternatives in synopsis
|
||||
|
||||
The code to find the effective end of log message can fall into an
|
||||
endless loop, which has been corrected.
|
||||
cf. <08b9b37d-f0f8-4c1a-b72e-194202ff3d9f@nutanix.com>
|
||||
source: <20240307183743.219951-1-flosch@nutanix.com>
|
||||
Documentation mark-up fix.
|
||||
source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ja/doc-markup-fixes (2024-03-11) 6 commits
|
||||
(merged to 'next' on 2024-03-14 at 4d1c26143f)
|
||||
+ doc: git-clone: format placeholders
|
||||
+ doc: git-clone: format verbatim words
|
||||
+ doc: git-init: rework config item init.templateDir
|
||||
+ doc: git-init: rework definition lists
|
||||
+ doc: git-init: format placeholders
|
||||
+ doc: git-init: format verbatim parts
|
||||
* jc/index-pack-fsck-levels (2024-03-15) 1 commit
|
||||
(merged to 'next' on 2024-03-18 at 243c5f4125)
|
||||
+ t5300: fix test_with_bad_commit()
|
||||
|
||||
Mark-ups used in the documentation has been improved for
|
||||
consistency.
|
||||
source: <pull.1687.git.1710097830.gitgitgadget@gmail.com>
|
||||
Test fix.
|
||||
source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jc/safe-implicit-bare (2024-03-11) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at e8bdbed1a4)
|
||||
+ setup: notice more types of implicit bare repositories
|
||||
* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
|
||||
(merged to 'next' on 2024-03-18 at 180db8ec38)
|
||||
+ bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
|
||||
|
||||
Users with safe.bareRepository=explicit can still work from within
|
||||
$GIT_DIR of a seconary worktree (which resides at .git/worktrees/$name/)
|
||||
of the primary worktree without explicitly specifying the $GIT_DIR
|
||||
environment variable or the --git-dir=<path> option.
|
||||
source: <xmqq5xxv0ywi.fsf_-_@gitster.g>
|
||||
"git bugreport --no-suffix" was not supported and instead
|
||||
segfaulted, which has been corrected.
|
||||
source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* jw/doc-show-untracked-files-fix (2024-03-13) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at 091f64ad6c)
|
||||
+ doc: status.showUntrackedFiles does not take "false"
|
||||
* rj/restore-plug-leaks (2024-03-14) 1 commit
|
||||
(merged to 'next' on 2024-03-15 at ac10ae7892)
|
||||
+ checkout: plug some leaks in git-restore
|
||||
|
||||
The status.showUntrackedFiles configuration variable was
|
||||
incorrectly documented to accept "false", which has been corrected.
|
||||
source: <pull.1686.git.git.1710279251901.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* pb/ci-win-artifact-names-fix (2024-03-11) 1 commit
|
||||
(merged to 'next' on 2024-03-14 at 5076389536)
|
||||
+ ci(github): make Windows test artifacts name unique
|
||||
|
||||
CI update.
|
||||
source: <pull.1688.git.1710101097072.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ps/reftable-block-search-fix (2024-03-07) 2 commits
|
||||
(merged to 'next' on 2024-03-13 at 34938e24ab)
|
||||
+ reftable/block: fix binary search over restart counter
|
||||
+ reftable/record: fix memory leak when decoding object records
|
||||
|
||||
The reftable code has its own custom binary search function whose
|
||||
comparison callback has an unusual interface, which caused the
|
||||
binary search to degenerate into a linear search, which has been
|
||||
corrected.
|
||||
source: <cover.1709843663.git.ps@pks.im>
|
||||
|
||||
|
||||
* ps/reftable-reflog-iteration-perf (2024-03-05) 8 commits
|
||||
(merged to 'next' on 2024-03-14 at 72465c29be)
|
||||
+ refs/reftable: track last log record name via strbuf
|
||||
+ reftable/record: use scratch buffer when decoding records
|
||||
+ reftable/record: reuse message when decoding log records
|
||||
+ reftable/record: reuse refnames when decoding log records
|
||||
+ reftable/record: avoid copying author info
|
||||
+ reftable/record: convert old and new object IDs to arrays
|
||||
+ refs/reftable: reload correct stack when creating reflog iter
|
||||
+ Merge branch 'ps/reftable-iteration-perf-part2' into ps/reftable-reflog-iteration-perf
|
||||
|
||||
The code to iterate over reflogs in the reftable has been optimized
|
||||
to reduce memory allocation and deallocation.
|
||||
|
||||
Reviewed-by: Josh Steadmon <steadmon@google.com>
|
||||
cf. <Ze9eX-aaWoVaqsPP@google.com>
|
||||
source: <cover.1709640322.git.ps@pks.im>
|
||||
|
||||
|
||||
* ps/reftable-stack-tempfile (2024-03-07) 4 commits
|
||||
(merged to 'next' on 2024-03-13 at dcfb0cde8c)
|
||||
+ reftable/stack: register compacted tables as tempfiles
|
||||
+ reftable/stack: register lockfiles during compaction
|
||||
+ reftable/stack: register new tables as tempfiles
|
||||
+ lockfile: report when rollback fails
|
||||
(this branch is used by ps/pack-refs-auto.)
|
||||
|
||||
The code in reftable backend that creates new table files works
|
||||
better with the tempfile framework to avoid leaving cruft after a
|
||||
failure.
|
||||
source: <cover.1709816483.git.ps@pks.im>
|
||||
|
||||
|
||||
* rs/opt-parse-long-fixups (2024-03-03) 6 commits
|
||||
(merged to 'next' on 2024-03-13 at 3755b50794)
|
||||
+ parse-options: rearrange long_name matching code
|
||||
+ parse-options: normalize arg and long_name before comparison
|
||||
+ parse-options: detect ambiguous self-negation
|
||||
+ parse-options: factor out register_abbrev() and struct parsed_option
|
||||
+ parse-options: set arg of abbreviated option lazily
|
||||
+ parse-options: recognize abbreviated negated option with arg
|
||||
|
||||
The parse-options code that deals with abbreviated long option
|
||||
names have been cleaned up.
|
||||
|
||||
Reviewed-by: Josh Steadmon <steadmon@google.com>
|
||||
cf. <ZfDM5Or3EKw7Q9SA@google.com>
|
||||
source: <20240303121944.20627-1-l.s.r@web.de>
|
||||
Leaks from "git restore" have been plugged.
|
||||
source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com>
|
||||
|
||||
--------------------------------------------------
|
||||
[New Topics]
|
||||
|
||||
* az/grep-group-error-message-update (2024-03-25) 1 commit
|
||||
- grep: improve errors for unmatched ( and )
|
||||
|
||||
Error message clarification.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <tkz3a5jkalcz5ajemx4b4x42pe6kv45sfmgpin4zeai3moq42o@tarta.nabijaczleweli.xyz>
|
||||
|
||||
|
||||
* bc/credential-scheme-enhancement (2024-03-25) 13 commits
|
||||
- credential: add support for multistage credential rounds
|
||||
- strvec: implement swapping two strvecs
|
||||
- t5563: refactor for multi-stage authentication
|
||||
- docs: set a limit on credential line length
|
||||
- credential: enable state capability
|
||||
- credential: add an argument to keep state
|
||||
- http: add support for authtype and credential
|
||||
- docs: indicate new credential protocol fields
|
||||
- credential: gate new fields on capability
|
||||
- credential: add a field for pre-encoded credentials
|
||||
- http: use new headers for each object request
|
||||
- remote-curl: reset headers on new request
|
||||
- credential: add an authtype field
|
||||
|
||||
The credential helper protocol, together with the HTTP layer, have
|
||||
been enhanced to support authentication schemes different from
|
||||
username & password pair, like Bearer and NTLM.
|
||||
|
||||
Needs review.
|
||||
source: <20240324011301.1553072-1-sandals@crustytoothpaste.net>
|
||||
|
||||
|
||||
* bl/pretty-shorthand-config-fix (2024-03-25) 2 commits
|
||||
- pretty: find pretty formats case-insensitively
|
||||
- pretty: update tests to use `test_config`
|
||||
|
||||
The "--pretty=<shortHand>" option of the commands in the "git log"
|
||||
family, defined as "[pretty] shortHand = <expansion>" should have
|
||||
been looked up case insensitively, but was not, which has been
|
||||
corrected.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <20240324214316.917513-1-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
* ds/grep-doc-updates (2024-03-25) 2 commits
|
||||
- grep docs: describe --no-index further and improve formatting a bit
|
||||
- grep docs: describe --recurse-submodules further and improve formatting a bit
|
||||
|
||||
Documentation updates.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <cover.1711398665.git.dsimic@manjaro.org>
|
||||
|
||||
|
||||
* ja/doc-markup-updates (2024-03-25) 4 commits
|
||||
- doc: git-clone: apply new documentation guidelines
|
||||
- doc: git-init: apply new documentation formatting guidelines
|
||||
- doc: allow literal and emphasis format in doc vs help tests
|
||||
- doc: rework CodingGuidelines with new formatting rules
|
||||
|
||||
Documentation rules has been explicitly described how to mark-up
|
||||
literal parts and a few manual pages have been updated as examples.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <pull.1702.git.1711318739.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* mg/editorconfig-makefile (2024-03-23) 1 commit
|
||||
- editorconfig: add Makefiles to "text files"
|
||||
|
||||
The .editorconfig file has been taught that a Makefile uses HT
|
||||
indentation.
|
||||
|
||||
Will merge to 'next'?
|
||||
source: <20240322221813.13019-1-mg@max.gautier.name>
|
||||
|
||||
|
||||
* pb/test-scripts-are-build-targets (2024-03-25) 1 commit
|
||||
- t/README: mention test files are make targets
|
||||
|
||||
The README now gives a hint on running individual tests in the "t/"
|
||||
directory with "make t<num>-*.sh t<num>-*.sh".
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <pull.1701.git.1711293246094.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ps/reftable-binsearch-updates (2024-03-25) 7 commits
|
||||
- reftable/block: avoid decoding keys when searching restart points
|
||||
- reftable/record: extract function to decode key lengths
|
||||
- reftable/block: fix error handling when searching restart points
|
||||
- reftable/block: refactor binary search over restart points
|
||||
- reftable/refname: refactor binary search over refnames
|
||||
- reftable/basics: improve `binsearch()` test
|
||||
- reftable/basics: fix return type of `binsearch()` to be `size_t`
|
||||
|
||||
Reftable code clean-up and some bugfixes.
|
||||
|
||||
Needs review.
|
||||
source: <cover.1711361340.git.ps@pks.im>
|
||||
|
||||
|
||||
* rs/midx-use-strvec-pushf (2024-03-25) 1 commit
|
||||
- midx: use strvec_pushf() for pack-objects base name
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <9483038c-9529-4243-9b9a-97254fac29c1@web.de>
|
||||
|
||||
|
||||
* rs/strbuf-expand-bad-format (2024-03-25) 2 commits
|
||||
- cat-file: use strbuf_expand_bad_format()
|
||||
- factor out strbuf_expand_bad_format()
|
||||
|
||||
Code clean-up.
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <27cdcde7-74bc-4ee8-bc84-9a6046292cae@web.de>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* jk/doc-remote-helpers-markup-fix (2024-03-20) 1 commit
|
||||
- doc/gitremote-helpers: fix more missing single-quotes
|
||||
(merged to 'next' on 2024-03-25 at 7c3dd28ca5)
|
||||
+ doc/gitremote-helpers: fix more missing single-quotes
|
||||
|
||||
Documentation mark-up fix.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <20240320091748.GA2444639@coredump.intra.peff.net>
|
||||
|
||||
|
||||
@ -213,27 +282,29 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* ps/reftable-unit-test-nfs-workaround (2024-03-21) 1 commit
|
||||
- reftable: fix tests being broken by NFS' delete-after-close semantics
|
||||
(merged to 'next' on 2024-03-25 at 4d3d391330)
|
||||
+ reftable: fix tests being broken by NFS' delete-after-close semantics
|
||||
|
||||
A unit test for reftable code tried to enumerate all files in a
|
||||
directory after reftable operations and expected to see nothing but
|
||||
the files it wanted to leave there, but was fooled by .nfs* cruft
|
||||
files left, which has been corrected.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <8ac5e94a3930cdd2aee9ea86acda3155674b635c.1711035529.git.ps@pks.im>
|
||||
|
||||
|
||||
* ps/t7800-variable-interpolation-fix (2024-03-22) 3 commits
|
||||
- t/README: document how to loop around test cases
|
||||
- t7800: use single quotes for test bodies
|
||||
- t7800: improve test descriptions with empty arguments
|
||||
(merged to 'next' on 2024-03-25 at e7b1ec4df4)
|
||||
+ t/README: document how to loop around test cases
|
||||
+ t7800: use single quotes for test bodies
|
||||
+ t7800: improve test descriptions with empty arguments
|
||||
|
||||
Fix the way recently added tests interpolate variables defined
|
||||
outside them, and document the best practice to help future
|
||||
developers.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <cover.1711074118.git.ps@pks.im>
|
||||
|
||||
|
||||
@ -273,7 +344,7 @@ Release tarballs are available at:
|
||||
source: <cover.1710972293.git.me@ttaylorr.com>
|
||||
|
||||
|
||||
* jc/release-notes-entry-experiment (2024-03-22) 1 commit
|
||||
* jc/release-notes-entry-experiment (2024-03-26) 1 commit
|
||||
- SubmittingPatches: release-notes entry experiment
|
||||
|
||||
Introduce an experimental protocol for contributors to propose the
|
||||
@ -281,21 +352,21 @@ Release tarballs are available at:
|
||||
merge commit message for the topic, and in the release notes and
|
||||
document it in the SubmittingPatches document.
|
||||
|
||||
source: <xmqqcyrn58mf.fsf@gitster.g>
|
||||
Will merge to 'next'.
|
||||
source: <xmqq8r26eyva.fsf@gitster.g>
|
||||
|
||||
|
||||
* jk/rebase-apply-leakfix (2024-03-22) 1 commit
|
||||
- rebase: use child_process_clear() to clean
|
||||
(merged to 'next' on 2024-03-25 at f9358272af)
|
||||
+ rebase: use child_process_clear() to clean
|
||||
|
||||
Leakfix.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <20240322103502.GA2045297@coredump.intra.peff.net>
|
||||
|
||||
--------------------------------------------------
|
||||
[Cooking]
|
||||
|
||||
* dg/myfirstobjectwalk-updates (2024-03-19) 5 commits
|
||||
* dg/myfirstobjectwalk-updates (2024-03-26) 5 commits
|
||||
- MyFirstObjectWalk: add stderr to pipe processing
|
||||
- MyFirstObjectWalk: fix description for counting omitted objects
|
||||
- MyFirstObjectWalk: fix filtered object walk
|
||||
@ -304,20 +375,22 @@ Release tarballs are available at:
|
||||
|
||||
Update a more recent tutorial doc.
|
||||
|
||||
Needs review.
|
||||
source: <cover.1710840596.git.dirk@gouders.net>
|
||||
Waiting for the final Ack.
|
||||
cf. <xmqqo7b1apx3.fsf@gitster.g>
|
||||
source: <cover.1711368498.git.dirk@gouders.net>
|
||||
|
||||
|
||||
* ds/config-internal-whitespace-fix (2024-03-21) 4 commits
|
||||
- config.txt: describe handling of whitespace further
|
||||
- t1300: add more tests for whitespace and inline comments
|
||||
- config: really keep value-internal whitespace verbatim
|
||||
- config: minor addition of whitespace
|
||||
(merged to 'next' on 2024-03-25 at f3393cabe5)
|
||||
+ config.txt: describe handling of whitespace further
|
||||
+ t1300: add more tests for whitespace and inline comments
|
||||
+ config: really keep value-internal whitespace verbatim
|
||||
+ config: minor addition of whitespace
|
||||
|
||||
"git config" corrupted literal HT characters written in the
|
||||
configuration file as part of a value, which has been corrected.
|
||||
|
||||
Will merge to 'next'.
|
||||
Will merge to 'master'.
|
||||
source: <cover.1711001016.git.dsimic@manjaro.org>
|
||||
|
||||
|
||||
@ -349,72 +422,6 @@ Release tarballs are available at:
|
||||
source: <20240320002555.GB903718@coredump.intra.peff.net>
|
||||
|
||||
|
||||
* bb/sh-scripts-cleanup (2024-03-16) 22 commits
|
||||
(merged to 'next' on 2024-03-18 at 4501a04796)
|
||||
+ git-quiltimport: avoid an unnecessary subshell
|
||||
+ contrib/coverage-diff: avoid redundant pipelines
|
||||
+ t/t9*: merge "grep | sed" pipelines
|
||||
+ t/t8*: merge "grep | sed" pipelines
|
||||
+ t/t5*: merge a "grep | sed" pipeline
|
||||
+ t/t4*: merge a "grep | sed" pipeline
|
||||
+ t/t3*: merge a "grep | awk" pipeline
|
||||
+ t/t1*: merge a "grep | sed" pipeline
|
||||
+ t/t9*: avoid redundant uses of cat
|
||||
+ t/t8*: avoid redundant use of cat
|
||||
+ t/t7*: avoid redundant use of cat
|
||||
+ t/t6*: avoid redundant uses of cat
|
||||
+ t/t5*: avoid redundant uses of cat
|
||||
+ t/t4*: avoid redundant uses of cat
|
||||
+ t/t3*: avoid redundant uses of cat
|
||||
+ t/t1*: avoid redundant uses of cat
|
||||
+ t/t0*: avoid redundant uses of cat
|
||||
+ t/perf: avoid redundant use of cat
|
||||
+ t/annotate-tests.sh: avoid redundant use of cat
|
||||
+ t/lib-cvs.sh: avoid redundant use of cat
|
||||
+ contrib/subtree/t: avoid redundant use of cat
|
||||
+ doc: avoid redundant use of cat
|
||||
|
||||
Shell scripts clean-up.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20240315194620.10713-1-dev+git@drbeat.li>
|
||||
|
||||
|
||||
* bl/doc-config-fixes (2024-03-16) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at a9038d5a9e)
|
||||
+ docs: fix typo in git-config `--default`
|
||||
+ docs: clarify file options in git-config `--edit`
|
||||
|
||||
A few typoes in "git config --help" have been corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20240316050149.1182867-2-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
* bl/doc-key-val-sep-fix (2024-03-18) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at b2e1babb85)
|
||||
+ docs: adjust trailer `separator` and `key_value_separator` language
|
||||
+ docs: correct trailer `key_value_separator` description
|
||||
|
||||
The documentation for "%(trailers[:options])" placeholder in the
|
||||
"--pretty" option of commands in the "git log" family has been
|
||||
updated.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <20240316035612.752910-1-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
* ja/doc-formatting-fix (2024-03-16) 2 commits
|
||||
(merged to 'next' on 2024-03-18 at edde7a576d)
|
||||
+ doc: fix some placeholders formating
|
||||
+ doc: format alternatives in synopsis
|
||||
|
||||
Documentation mark-up fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1697.git.1710602501.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* la/hide-trailer-info (2024-03-16) 7 commits
|
||||
- trailer: retire trailer_info_get() from API
|
||||
- trailer: make trailer_info struct private
|
||||
@ -430,13 +437,17 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* pb/advice-merge-conflict (2024-03-18) 2 commits
|
||||
- builtin/am: allow disabling conflict advice
|
||||
- sequencer: allow disabling conflict advice
|
||||
(merged to 'next' on 2024-03-25 at 4414e31d81)
|
||||
+ builtin/am: allow disabling conflict advice
|
||||
+ sequencer: allow disabling conflict advice
|
||||
|
||||
Hints that suggest what to do after resolving conflicts can now be
|
||||
squelched by disabling advice.mergeConflict.
|
||||
|
||||
Will merge to 'next'?
|
||||
Acked-by: Phillip Wood <phillip.wood123@gmail.com>
|
||||
cf. <e040c631-42d9-4501-a7b8-046f8dac6309@gmail.com>
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1682.v3.git.1710623790.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
@ -451,7 +462,7 @@ Release tarballs are available at:
|
||||
source: <9bf36cc8-ff27-44df-b2fb-9f959c781269@web.de>
|
||||
|
||||
|
||||
* ps/pack-refs-auto (2024-03-18) 16 commits
|
||||
* ps/pack-refs-auto (2024-03-25) 16 commits
|
||||
- builtin/gc: pack refs when using `git maintenance run --auto`
|
||||
- builtin/gc: forward git-gc(1)'s `--auto` flag when packing refs
|
||||
- t6500: extract objects with "17" prefix
|
||||
@ -472,8 +483,11 @@ Release tarballs are available at:
|
||||
"git pack-refs" learned the "--auto" option, which is a useful
|
||||
addition to be triggered from "git gc --auto".
|
||||
|
||||
Being reviewed (Karthik e.g. <CAOLa=ZS6uF3fuor3V2F_GM__JNRpUAyLcrVDbCHsJ6JStL96cA@mail.gmail.com>)
|
||||
source: <cover.1710706118.git.ps@pks.im>
|
||||
Acked-by: Karthik Nayak <karthik.188@gmail.com>
|
||||
cf. <CAOLa=ZRAEA7rSUoYL0h-2qfEELdbPHbeGpgBJRqesyhHi9Q6WQ@mail.gmail.com>
|
||||
|
||||
Will merge to 'next'.
|
||||
source: <cover.1711360631.git.ps@pks.im>
|
||||
|
||||
|
||||
* jc/show-untracked-false (2024-03-13) 2 commits
|
||||
@ -491,17 +505,6 @@ Release tarballs are available at:
|
||||
source: <20240313173214.962532-1-gitster@pobox.com>
|
||||
|
||||
|
||||
* js/bugreport-no-suffix-fix (2024-03-16) 1 commit
|
||||
(merged to 'next' on 2024-03-18 at 180db8ec38)
|
||||
+ bugreport.c: fix a crash in `git bugreport` with `--no-suffix` option
|
||||
|
||||
"git bugreport --no-suffix" was not supported and instead
|
||||
segfaulted, which has been corrected.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <9c6f3f5203ae26c501a5711e2610573130bfd550.1710388817.git.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* ph/diff-src-dst-prefix-config (2024-03-18) 2 commits
|
||||
(merged to 'next' on 2024-03-21 at 96801520db)
|
||||
+ diff.*Prefix: use camelCase in the doc and test titles
|
||||
@ -515,23 +518,13 @@ Release tarballs are available at:
|
||||
|
||||
|
||||
* ps/clone-with-includeif-onbranch (2024-03-12) 1 commit
|
||||
- t5601: exercise clones with "includeIf.*.onbranch"
|
||||
(merged to 'next' on 2024-03-25 at 8d11bd8bd4)
|
||||
+ t5601: exercise clones with "includeIf.*.onbranch"
|
||||
|
||||
An additional test to demonstrate something I am not sure what.
|
||||
|
||||
Waiting for a review response.
|
||||
cf. <xmqqo7bjjid9.fsf@gitster.g>
|
||||
source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
|
||||
|
||||
|
||||
* rj/restore-plug-leaks (2024-03-14) 1 commit
|
||||
(merged to 'next' on 2024-03-15 at ac10ae7892)
|
||||
+ checkout: plug some leaks in git-restore
|
||||
|
||||
Leaks from "git restore" have been plugged.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <64c1c3cc-51d7-4168-9731-4389889e1449@gmail.com>
|
||||
source: <0bede59a53862585c49bc635f82e44e983144a7f.1710246859.git.ps@pks.im>
|
||||
|
||||
|
||||
* bt/fuzz-config-parse (2024-03-15) 1 commit
|
||||
@ -554,16 +547,6 @@ Release tarballs are available at:
|
||||
source: <97bdaf075bf5a68554cca1731eca78aff2662907.1710444774.git.dsimic@manjaro.org>
|
||||
|
||||
|
||||
* jc/index-pack-fsck-levels (2024-03-15) 1 commit
|
||||
(merged to 'next' on 2024-03-18 at 243c5f4125)
|
||||
+ t5300: fix test_with_bad_commit()
|
||||
|
||||
Test fix.
|
||||
|
||||
Will merge to 'master'.
|
||||
source: <pull.1688.git.git.1710478646776.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* la/format-trailer-info (2024-03-15) 5 commits
|
||||
- trailer: finish formatting unification
|
||||
- trailer: begin formatting unification
|
||||
@ -608,13 +591,13 @@ Release tarballs are available at:
|
||||
source: <pull.1684.v2.git.1710435907.gitgitgadget@gmail.com>
|
||||
|
||||
|
||||
* bl/cherry-pick-empty (2024-03-20) 7 commits
|
||||
* bl/cherry-pick-empty (2024-03-25) 7 commits
|
||||
- cherry-pick: add `--empty` for more robust redundant commit handling
|
||||
- cherry-pick: enforce `--keep-redundant-commits` incompatibility
|
||||
- sequencer: do not require `allow_empty` for redundant commit options
|
||||
- sequencer: handle unborn branch with `--allow-empty`
|
||||
- rebase: update `--empty=ask` to `--empty=stop`
|
||||
- docs: clean up `--empty` formatting in git-rebase(1) and git-am (1)
|
||||
- docs: clean up `--empty` formatting in git-rebase(1) and git-am(1)
|
||||
- docs: address inaccurate `--empty` default with `--exec`
|
||||
|
||||
Allow git-cherry-pick(1) to automatically drop redundant commits via
|
||||
@ -624,6 +607,7 @@ Release tarballs are available at:
|
||||
sequencer code cleanup.
|
||||
|
||||
Will merge to 'next'?
|
||||
cf. <a397f3dd-e4e1-4275-b17d-1daca9e166fe@gmail.com>
|
||||
source: <20240119060721.3734775-2-brianmlyles@gmail.com>
|
||||
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user