more than one main upstream tarballs listed.
There is 1 open security issue in buster.
commit bfdd0c8290187d5a21c65e3a8a6e0d519b246190
Merge: 95da7e4da9 325a9cefb0
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 19:15:34 2025 +0100
Merge branch 'debian-sid' into debian-experimental
* debian-sid:
debian: Standards-Version: 4.7.0
debian: new upstream release
NMU for CVE-2024-50349 and CVE-2024-52006
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 95da7e4da90e1284d554933a2839a59207d29da8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 19:10:00 2025 +0100
debian: new "next" snapshot
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 325a9cefb0494055d370639d261b361199389ee8
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 18:50:05 2025 +0100
debian: Standards-Version: 4.7.0
The main change this brings for us is that doc-base support is now
optional (and hence we drop it).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 804061d051ef4795da621f5a57672457b317cfee
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 18:43:35 2025 +0100
debian: new upstream release
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 9141f91f4445fbc1bc14a3a2f86d3cb0eb02a353
Merge: 4954718790 12beb8f557
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 18:26:27 2025 +0100
Merge branch 'next' of https://kernel.googlesource.com/pub/scm/git/git into debian-experimental
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 07ab309e7c63bf2e5f36698fe02c81f75c536161
Merge: 32a5e12354 683c54c999
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sat Mar 15 18:13:57 2025 +0100
Merge tag 'v2.49.0' into debian-sid
Git 2.49
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit 12beb8f557ceb4a6dcea497ea420e7576a3aeca0
Merge: d1b26642da 683c54c999
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Mar 14 15:23:21 2025 -0700
Sync with Git 2.49
commit d1b26642dacc169ed6e4a1495e3fa114e8b27faa
Merge: e278b902bb c9d3534de3
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Mar 13 12:04:35 2025 -0700
Sync with 'master'
commit e278b902bb770b75d0295eb776545312351efd36
Merge: 8d6641a77e 4b68faf6b9
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Mar 12 12:08:23 2025 -0700
Sync with 'master'
commit 8d6641a77e891bbd2c9283a0e589fe05e6231cfd
Merge: 67ce5e4795 227c4f33a0
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Mar 11 16:40:36 2025 -0700
Merge branch 'ja/doc-block-delimiter-markup-fix' into next
Doc markup updates.
* ja/doc-block-delimiter-markup-fix:
doc: add a blank line around block delimiters
commit 67ce5e479569658232f7da791d9da710e3dfca8e
Merge: f6994c5077 0d03fda6a5
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Mar 11 16:40:35 2025 -0700
Merge branch 'pb/doc-follow-remote-head' into next
Doc updates.
* pb/doc-follow-remote-head:
config/remote.txt: improve wording for 'remote.<name>.followRemoteHEAD'
config/remote.txt: reunite 'severOption' description paragraphs
commit f6994c50774be5ae419733b56ded2b23fb85798a
Merge: 29657bf057 83b278ef74
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Mar 10 13:10:46 2025 -0700
Merge branch 'ma/clone-doc-markup-fix' into next
* ma/clone-doc-markup-fix:
git-clone doc: fix indentation
commit 227c4f33a0351d12b04660a9f03ca96dbab1310a
Author: Jean-Noël Avila <jn.avila@free.fr>
Date: Sun Mar 9 19:45:11 2025 +0000
doc: add a blank line around block delimiters
The documentation is using the historical mode for titles, which is a
setext-style (i.e., two-line) section title.
The issue with this mode is that starting block delimiters (e.g.,
`----`) can be confused with a section title when they are exactly the
same length as the preceding line. In the original documentation, this
is taken care of for English by the writer, but it is not the case for
translations where these delimiters are hidden. A translator can
generate a line that is exactly the same length as the following block
delimiter, which leads to this line being considered as a title.
To safeguard against this issue, add a blank line before and after
block delimiters where block is at root level, else add a "+" line
before block delimiters to link it to the preceding paragraph.
Signed-off-by: Jean-Noël Avila <jn.avila@free.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 29657bf05791b91f723daea0f035b33ae8ef21c3
Merge: c00cd54a64 87a0bdbf0f
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Mar 10 09:01:08 2025 -0700
Sync with Git 2.49-rc2
commit c00cd54a64c68bb7fc6417cdb91accf2eb89eb27
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Mar 10 08:41:57 2025 -0700
Revert "Merge branch 'jk/use-wunreachable-code-for-devs' into next"
This reverts commit b5c54fea6a6a4c2cba774466a76c40d0348f7a2b, reversing
changes made to 4cd33545ba4fa82324b454aa5bf2748b40a572fb.
Clang used on osx CI seems to be too clever and complains about a
defensive programming like
if (sigfillset(&all))
die_errno("sigfillset");
as it knows that the call would never fail on that platform.
commit 01f2b845292a11ef1d0a77a705fb003137259cb0
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Mar 7 16:56:41 2025 -0800
Merge branch 'ua/some-builtins-wo-the-repository' into next
A handful of built-in command implementations have been rewritten
to use the repository instance supplied by git.c:run_builtin(), its
caller.
* ua/some-builtins-wo-the-repository:
builtin/checkout-index: stop using `the_repository`
builtin/for-each-ref: stop using `the_repository`
builtin/ls-files: stop using `the_repository`
builtin/pack-refs: stop using `the_repository`
builtin/send-pack: stop using `the_repository`
builtin/verify-commit: stop using `the_repository`
builtin/verify-tag: stop using `the_repository`
config: teach repo_config to allow `repo` to be NULL
commit 4954718790598c65424ba5e57584f337af3d524a
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Feb 14 10:39:14 2025 -0800
debian: new "next" snapshot
Change-Id: I48e8ac0f6c30d017a479833125054f983614d5e0
Signed-off-by: Josh Steadmon <steadmon@google.com>
commit 70e232d442d4f6dfa1e347936fa9c1d9de2b862a
Merge: cdd003511f 4767266eb4
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Feb 14 10:34:11 2025 -0800
Merge branch 'next' into debian-experimental
Change-Id: I23c3b0e3fed049156da231b4d6b0c8d481d7f68f
Signed-off-by: Josh Steadmon <steadmon@google.com>
commit 4767266eb4cedeaf40e4bda87fb9c8b6ae1ef127
Merge: ab142d21e8 3eeed876a9
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 13 13:48:23 2025 -0800
Merge branch 'ac/doc-http-ssl-type-config' into next
Two configuration variables about SSL authentication material that
weren't mentioned in the documentations are now mentioned.
* ac/doc-http-ssl-type-config:
docs: indicate http.sslCertType and sslKeyType
commit ab142d21e83327d8eb26a482349093f1609556ae
Merge: 2069f4865c 832f56f06a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 13 13:48:23 2025 -0800
Merge branch 'jc/doc-boolean-synonyms' into next
Doc updates.
* jc/doc-boolean-synonyms:
doc: centrally document various ways tospell `true` and `false`
commit 2069f4865c39ed7017d66df693937600eaa8fa2b
Merge: d4e8288c9b 45761988ac
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 13 13:48:22 2025 -0800
Merge branch 'en/doc-renormalize' into next
Doc updates.
* en/doc-renormalize:
doc: clarify the intent of the renormalize option in the merge machinery
commit d4e8288c9b136a078a53c228b9fbad96f5850eea
Merge: 5ffbd7fcf8 62898b8f5e
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 13 13:48:22 2025 -0800
Merge branch 'ua/update-server-info-sans-the-repository' into next
Code clean-up.
* ua/update-server-info-sans-the-repository:
builtin/update-server-info: remove the_repository global variable
commit 5ffbd7fcf84b313bb07e91246eb9419ebd94a7e7
Merge: d13b5baf06 e2067b49ec
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 12 10:11:08 2025 -0800
Sync with 'master'
commit d13b5baf06b301c3b4297930003759edc1f2edc9
Merge: c4ad516cd7 59d26bd961
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 15:45:07 2025 -0800
Merge branch 'bc/contrib-thunderbird-patch-inline-fix' into next
A thunderbird helper script lost its bashism.
* bc/contrib-thunderbird-patch-inline-fix:
thunderbird-patch-inline: avoid bashism
commit c4ad516cd7fc4e722ab73f2fbbd245aaf181b2c9
Merge: 782243c538 f1cc562b77
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 11 15:45:07 2025 -0800
Merge branch 'lo/t7603-path-is-file-update' into next
Test clean-up.
* lo/t7603-path-is-file-update:
t7603: replace test -f by test_path_is_file
commit 782243c5383dd40d26d75dc97d7fc39900fb60a7
Merge: e22cc108b6 388218fac7
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 10 10:22:52 2025 -0800
Sync with 'master'
commit e22cc108b684920a6e46f924893279c821135d13
Merge: 88955fe5b4 7c2f291943
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 10 10:22:34 2025 -0800
Merge branch 'da/difftool-sans-the-repository' into next
"git difftool" code clean-up.
* da/difftool-sans-the-repository:
difftool: eliminate use of USE_THE_REPOSITORY_VARIABLE
difftool: eliminate use of the_repository
difftool: eliminate use of global variables
commit 88955fe5b4b1dc7505854d9ee138915a27e8210d
Merge: 7d93e5ad97 3295c35398
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 10 10:22:34 2025 -0800
Merge branch 'jt/rev-list-missing-print-info' into next
"git rev-list --missing=" learned to accept "print-info" that gives
known details expected of the missing objects, like path and type.
* jt/rev-list-missing-print-info:
rev-list: extend print-info to print missing object type
rev-list: add print-info action to print missing object path
commit 7d93e5ad978ba1d3fb88d5395bdf32201b3bdd36
Merge: d6348c9f60 b81f8c8dd3
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 10 10:22:33 2025 -0800
Merge branch 'ps/send-pack-unhide-error-in-atomic-push' into next
"git push --atomic --porcelain" used to ignore failures from the
other side, losing the error status from the child process, which
has been corrected.
* ps/send-pack-unhide-error-in-atomic-push:
send-pack: gracefully close the connection for atomic push
t5543: atomic push reports exit code failure
send-pack: new return code "ERROR_SEND_PACK_BAD_REF_STATUS"
t5548: add porcelain push test cases for dry-run mode
t5548: add new porcelain test cases
t5548: refactor test cases by resetting upstream
t5548: refactor to reuse setup_upstream() function
t5504: modernize test by moving heredocs into test bodies
commit d6348c9f60fe5507e03be9a59896af2607e522a7
Merge: 30ceb7b040 85127bcdea
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 10 10:22:33 2025 -0800
Merge branch 'ds/backfill' into next
Lazy-loading missing files in a blobless clone on demand is costly
as it tends to be one-blob-at-a-time. "git backfill" is introduced
to help bulk-download necessary files beforehand.
* ds/backfill:
backfill: assume --sparse when sparse-checkout is enabled
backfill: add --sparse option
backfill: add --min-batch-size=<n> option
backfill: basic functionality and tests
backfill: add builtin boilerplate
commit cdd003511f984a6f63dc3b21bec264e41212cbbb
Author: Kyle Lippincott <spectral@google.com>
Date: Thu Feb 6 17:25:10 2025 -0800
debian: fix links in doc-base files
1f010d6bdf (doc: use .adoc extension for AsciiDoc files, 2025-01-20)
renamed Documentation/*.txt to Documentation/*.adoc. The
debian/git-doc.doc-base files were not updated to point to these new
files, so lintian was emitting warnings about non-existent files.
Most of the files were compressed by the debian/rules file, producing
files named `foo.adoc.gz` instead of just `foo.adoc`. That's been
corrected as well, to no longer compress .adoc files.
Change-Id: Ide9632932cef9ffdd818d96fab645ebc6ca9592f
Signed-off-by: Kyle Lippincott <spectral@google.com>
commit a4c29fae90cda94716fb5d671496213d6ccb5348
Author: Kyle Lippincott <spectral@google.com>
Date: Fri Feb 7 12:18:39 2025 -0800
debian: new "next" snapshot
Change-Id: I495c7bc36075494c2ef234758d6817672a7b497b
Signed-off-by: Kyle Lippincott <spectral@google.com>
commit 328fa03b1eeeeb40e27ff9e3c16a02668d03641f
Merge: 62d2f3c6d3 30ceb7b040
Author: Kyle Lippincott <spectral@google.com>
Date: Fri Feb 7 12:18:07 2025 -0800
Merge branch 'next' into debian-experimental
Change-Id: I862fdcabb7b1d95b99550d82bcc055a46baab10e
Signed-off-by: Kyle Lippincott <spectral@google.com>
commit 30ceb7b040fb0d98a6c17a39c106f6eb9a112b24
Merge: dd19c245e9 9520f7d998
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:30 2025 -0800
Sync with 'master'
commit dd19c245e9baf5d5c7bf7f6b54330a0689278283
Merge: 1b0fc3be42 dd1eb665ef
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:17 2025 -0800
Merge branch 'ps/doc-http-upload-archive-service' into next
Doc update.
* ps/doc-http-upload-archive-service:
doc: documentation for http.uploadarchive config option
commit 1b0fc3be4253a69878b6ea6687cb867091bf59ae
Merge: 9d20f0b55a 017bd89239
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:16 2025 -0800
Merge branch 'kn/reflog-migration-fix-followup' into next
Code clean-up.
* kn/reflog-migration-fix-followup:
reftable: prevent 'update_index' changes after adding records
refs: use 'uint64_t' for 'ref_update.index'
refs: mark `ref_transaction_update_reflog()` as static
commit 9d20f0b55aaaf584c236a64adfd377fbe357007e
Merge: 25c618bf37 93dc16483a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:16 2025 -0800
Merge branch 'bf/fetch-set-head-fix' into next
Fetching into a bare repository incorrectly assumed it always used
a mirror layout when deciding to update remote-tracking HEAD, which
has been corrected.
* bf/fetch-set-head-fix:
fetch set_head: fix non-mirror remotes in bare repositories
fetch set_head: refactor to use remote directly
commit 25c618bf37b6285c8beb0e7b6c9fa2aa4dbae5fb
Merge: d67b50d35c 78a95e0d80
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:16 2025 -0800
Merge branch 'op/worktree-is-main-bare-fix' into next
Going into a secondary worktree and asking "is the main worktree
bare?" did not work correctly when per-worktree configuration
option was in use, which has been corrected.
* op/worktree-is-main-bare-fix:
worktree: detect from secondary worktree if main worktree is bare
commit d67b50d35cdbdf01c455d6c630128780fbe81b33
Merge: 74a3c43834 337855629f
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Feb 6 14:59:15 2025 -0800
Merge branch 'tc/clone-single-revision' into next
"git clone" learned to make a shallow clone for a single commit
that is not necessarily be at the tip of any branch.
* tc/clone-single-revision:
builtin/clone: teach git-clone(1) the --revision= option
parse-options: introduce die_for_incompatible_opt2()
clone: introduce struct clone_opts in builtin/clone.c
clone: add tags refspec earlier to fetch refspec
clone: refactor wanted_peer_refs()
clone: make it possible to specify --tags
clone: cut down on global variables in clone.c
commit 74a3c43834882219aa12aa1815d441a1762ba558
Merge: 1ecb7c7c9c e4542d8b35
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:39 2025 -0800
Merge branch 'da/help-autocorrect-one-fix' into next
"git -c help.autocorrect=0 psuh" shows the suggested typofix,
unlike the previous attempt in the base topic.
* da/help-autocorrect-one-fix:
help: add "show" as a valid configuration value
help: show the suggested command when help.autocorrect is false
commit 1ecb7c7c9c817c334f4b39253cb1df8fd1d9523d
Merge: 3d58d63932 4e3dd47c9d
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:39 2025 -0800
Merge branch 'sc/help-autocorrect-one' into next
"[help] autocorrect = 1" used to be a way to say "please wait for
0.1 second after suggesting a typofix of the command name before
running that command"; now it means "yes, if there is a plausible
typofix for the command name, please run it immediately".
* sc/help-autocorrect-one:
help: interpret boolean string values for help.autocorrect
commit 3d58d63932c66a56b87671ef10eb01d40aae3afa
Merge: 5b53c49215 f21ea69d94
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:39 2025 -0800
Merge branch 'ms/remote-valid-remote-name' into next
Code shuffling.
* ms/remote-valid-remote-name:
remote: relocate valid_remote_name
commit 5b53c492157b34c83e9e4f10661d7a8c6dc38f65
Merge: 7bbd51e504 d549b6c9ff
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:38 2025 -0800
Merge branch 'ms/refspec-cleanup' into next
Code clean-up.
* ms/refspec-cleanup:
refspec: relocate apply_refspecs and related funtions
refspec: relocate matching related functions
remote: rename query_refspecs functions
refspec: relocate refname_matches_negative_refspec_item
remote: rename function omit_name_by_refspec
commit 7bbd51e504b715034afeea2e0d294224c516fb24
Merge: e075d609ae 6bba6f604b
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:38 2025 -0800
Merge branch 'jp/doc-trailer-config' into next
Documentaiton updates.
* jp/doc-trailer-config:
config.txt: add trailer.* variables
commit e075d609ae7c11cefa915a4670c8743e06b5c828
Merge: ac1fefbba1 08032fa30f
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:37 2025 -0800
Merge branch 'zh/gc-expire-to' into next
"git gc" learned the "--expire-to" option and passes it down to
underlying "git repack".
* zh/gc-expire-to:
gc: add `--expire-to` option
commit ac1fefbba15ae94724da9af846d1c43a07092dd9
Merge: 6bd1c91b06 65c10aa8d5
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Feb 5 14:00:36 2025 -0800
Merge branch 'js/libgit-rust' into next
Foreign language interface for Rust into our code base has been added.
* js/libgit-rust:
libgit: add higher-level libgit crate
libgit-sys: also export some config_set functions
libgit-sys: introduce Rust wrapper for libgit.a
common-main: split init and exit code into new files
commit 6bd1c91b067bc73fdcedcc85aa2367f340cf3a2b
Merge: 5290fb63c2 318f4c9827
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 4 12:10:34 2025 -0800
Merge branch 'ac/t5401-use-test-path-is-file' into next
Test clean-up.
* ac/t5401-use-test-path-is-file:
t5401: prefer test_path_is_* helper function
commit 5290fb63c276db44dd623457095bb82eb0775882
Merge: 96a862b6f8 7c1d34fe5d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 4 12:10:33 2025 -0800
Merge branch 'ac/t6423-unhide-git-exit-status' into next
Test clean-up.
* ac/t6423-unhide-git-exit-status:
t6423: fix suppression of Git’s exit code in tests
commit 96a862b6f88b0e3033180f76100016a687cf09a6
Merge: d83bc700a7 414c82300a
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 4 12:10:33 2025 -0800
Merge branch 'ps/repack-keep-unreachable-in-unpacked-repo' into next
"git repack --keep-unreachable" to send unreachable objects to the
main pack "git repack -ad" produces did not work when there is no
existing packs, which has been corrected.
* ps/repack-keep-unreachable-in-unpacked-repo:
builtin/repack: fix `--keep-unreachable` when there are no packs
commit d83bc700a7f348931b07f668680dce2675ffff77
Merge: c4cfc42d60 b4cf68476a
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Feb 4 12:10:32 2025 -0800
Merge branch 'ds/name-hash-tweaks' into next
"git pack-objects" and its wrapper "git repack" learned an option
to use an alternative path-hash function to improve delta-base
selection to produce a packfile with deeper history than window
size.
* ds/name-hash-tweaks:
pack-objects: prevent name hash version change
test-tool: add helper for name-hash values
p5313: add size comparison test
pack-objects: add GIT_TEST_NAME_HASH_VERSION
repack: add --name-hash-version option
pack-objects: add --name-hash-version option
pack-objects: create new name-hash function version
commit c4cfc42d605a2b75c802dafdff4ee0014344f5d0
Merge: 9597182d1d bc204b7427
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:27:26 2025 -0800
Sync with 'master'
commit 9597182d1d407a71dc51f81a32bc53721a6f9b8d
Merge: 163109072c 14ddc393b1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:11 2025 -0800
Merge branch 'jk/ci-coverity-update' into next
CI update to make Coverity job work again.
* jk/ci-coverity-update:
ci: set CI_JOB_IMAGE for coverity job
commit 163109072c24eb2fc0333364708908f0917bc519
Merge: 98bdef7666 af8bf677c1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:10 2025 -0800
Merge branch 'sk/unit-tests-0130' into next
Convert a handful of unit tests to work with the clar framework.
* sk/unit-tests-0130:
t/unit-tests: convert strcmp-offset test to use clar test framework
t/unit-tests: convert strbuf test to use clar test framework
t/unit-tests: adapt example decorate test to use clar test framework
t/unit-tests: convert hashmap test to use clar test framework
commit 98bdef76667ca45d9d2a1cf50ef20ae266dd60fb
Merge: bf225248c9 0578f1e66a
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:10 2025 -0800
Merge branch 'ps/hash-cleanup' into next
Further code clean-up on the use of hash functions. Now the
context object knows what hash function it is working with.
* ps/hash-cleanup:
global: adapt callers to use generic hash context helpers
hash: provide generic wrappers to update hash contexts
hash: stop typedeffing the hash context
hash: convert hashing context to a structure
commit bf225248c988bc547241cbe91dd883d4bf06f1e4
Merge: e2b37c2c77 acc4fb302b
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:09 2025 -0800
Merge branch 'jt/gitlab-ci-base-fix' into next
Two CI tasks, whitespace check and style check, work on the
difference from the base version and the version being checked, but
the base was computed incorrectly in GitLab CI in some cases, which
has been corrected.
* jt/gitlab-ci-base-fix:
ci: fix base commit fallback for check-whitespace and check-style
commit e2b37c2c7745b98d13ef129ce09f19e2b0ea2c7d
Merge: b4eb8f2fc8 a206058fda
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:09 2025 -0800
Merge branch 'pw/apply-ulong-overflow-check' into next
"git apply" internally uses unsigned long for line numbers and uses
strtoul() to parse numbers on the hunk headers. It however forgot
to check parse errors.
* pw/apply-ulong-overflow-check:
apply: detect overflow when parsing hunk header
commit b4eb8f2fc8057eba78fa54b9f5aa70e43ca04fb6
Merge: 6defb0235c 7e88640cd1
Author: Junio C Hamano <gitster@pobox.com>
Date: Mon Feb 3 10:25:09 2025 -0800
Merge branch 'ps/setup-reinit-fixes' into next
"git init" to reinitialize a repository that already exists cannot
change the hash function and ref backends; such a request is
silently ignored now.
* ps/setup-reinit-fixes:
setup: fix reinit of repos with incompatible GIT_DEFAULT_HASH
setup: fix reinit of repos with incompatible GIT_DEFAULT_REF_FORMAT
t0001: remove duplicate test
commit 62d2f3c6d3c2c27154b0a600c5492fda29bf358e
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jan 31 10:24:55 2025 -0800
debian: new "next" snapshot
Change-Id: Ia0602815168bff7158323ce256c78ad6141bd229
Signed-off-by: Josh Steadmon <steadmon@google.com>
commit 973809026cfa62f62c5dfdb0ad5a48dd616b93d6
Merge: d8f9f50db2 6dc24dfdaf
Author: Josh Steadmon <steadmon@google.com>
Date: Fri Jan 31 10:17:02 2025 -0800
Merge branch 'next' into debian-experimental
Change-Id: I70098fcf9364c77184bf27651cfbb6d413e7c226
Signed-off-by: Josh Steadmon <steadmon@google.com>
commit 6defb0235c6e7c46974d7d65de7530e559ddcf0c
Merge: 6dc24dfdaf 58b5801aa9
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 31 09:57:16 2025 -0800
Sync with 'master'
commit 6dc24dfdaff5e6b5c5e185345c87a74383198d4a
Merge: ecf8e8bbef 087740d65a
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 30 14:57:25 2025 -0800
Merge branch 'ps/leakfixes-0129' into next
A few more leakfixes.
* ps/leakfixes-0129:
scalar: free result of `remote_default_branch()`
unix-socket: fix memory leak when chdir(3p) fails
commit ecf8e8bbeff2edddfeebe7213b294c22ced1e8e8
Merge: bf5f394be8 78cdeed4c7
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 30 14:57:25 2025 -0800
Merge branch 'ps/zlib-ng' into next
The code paths to interact with zlib has been cleaned up in
preparation for building with zlib-ng.
* ps/zlib-ng:
ci: make "linux-musl" job use zlib-ng
ci: switch linux-musl to use Meson
compat/zlib: allow use of zlib-ng as backend
git-zlib: cast away potential constness of `next_in` pointer
compat/zlib: provide stubs for `deflateSetHeader()`
compat/zlib: provide `deflateBound()` shim centrally
git-compat-util: move include of "compat/zlib.h" into "git-zlib.h"
compat: introduce new "zlib.h" header
git-compat-util: drop `z_const` define
compat: drop `uncompress2()` compatibility shim
commit bf5f394be8f5b245b73758b02b3dc81e036a3245
Merge: e490587933 3b0d05c4a7
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 29 15:09:37 2025 -0800
Sync with 'master'
commit e490587933d87764fc4e7888e06a826c4aedcdfb
Merge: 4d2f9d7f18 9a84794ad8
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 29 15:09:20 2025 -0800
Merge branch 'js/bundle-unbundle-fd-reuse-fix' into next
The code path used when "git fetch" fetches from a bundle file
closed the same file descriptor twice, which sometimes broke things
unexpectedly when the file descriptor was reused, which has been
corrected.
* js/bundle-unbundle-fd-reuse-fix:
bundle: avoid closing file descriptor twice
commit 4d2f9d7f18c5060a49537fa0f263be1b7fa775b8
Merge: c0086e9015 e39e332e50
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 29 15:09:19 2025 -0800
Merge branch 'ps/ci-misc-updates' into next
CI updates (containerization, dropping stale ones, etc.).
* ps/ci-misc-updates:
ci: remove stale code for Azure Pipelines
ci: use latest Ubuntu release
ci: stop special-casing for Ubuntu 16.04
gitlab-ci: add linux32 job testing against i386
gitlab-ci: remove the "linux-old" job
github: simplify computation of the job's distro
github: convert all Linux jobs to be containerized
github: adapt containerized jobs to be rootless
t7422: fix flaky test caused by buffered stdout
t0060: fix EBUSY in MinGW when setting up runtime prefix
commit c0086e901505c59d6f9714f961c0d48cd86ef36b
Merge: e70c392ca2 da898a5c64
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:20:11 2025 -0800
Sync with 'master'
commit e70c392ca208d04b3b8c750e233ff4c0c007b51d
Merge: bb5f4b8547 f11f0a5a2d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:20:00 2025 -0800
Merge branch 'kn/reflog-migration-fix-fix' into next
Fix bugs in an earlier attempt to fix "git refs migration".
* kn/reflog-migration-fix-fix:
refs/reftable: fix uninitialized memory access of `max_index`
commit bb5f4b8547d367ae6876d9df03298f25579b9b80
Merge: c7c317a06f 8705c9bd13
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:20:00 2025 -0800
Merge branch 'kn/pack-write-with-reduced-globals' into next
Code clean-up.
* kn/pack-write-with-reduced-globals:
pack-write: pass hash_algo to internal functions
pack-write: pass hash_algo to `write_rev_file()`
pack-write: pass hash_algo to `write_idx_file()`
pack-write: pass repository to `index_pack_lockfile()`
pack-write: pass hash_algo to `fixup_pack_header_footer()`
commit c7c317a06fc6b667a0f3458473faf2a2fb45fde8
Merge: 2196ecadc4 7304bd2bc3
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:20:00 2025 -0800
Merge branch 'ps/build-meson-fixes' into next
More build fixes and enhancements on meson based build procedure.
* ps/build-meson-fixes:
ci: wire up Visual Studio build with Meson
ci: raise error when Meson generates warnings
meson: fix compilation with Visual Studio
meson: make the CSPRNG backend configurable
meson: wire up fuzzers
meson: wire up generation of distribution archive
meson: wire up development environments
meson: fix dependencies for generated headers
meson: populate project version via GIT-VERSION-GEN
GIT-VERSION-GEN: allow running without input and output files
GIT-VERSION-GEN: simplify computing the dirty marker
commit 2196ecadc4142e7f7f07ea9176571bbd7c6076f1
Merge: 970fcdf59d 49edce4ff9
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:19:59 2025 -0800
Merge branch 'jc/show-index-h-update' into next
Doc and short-help text for "show-index" has been clarified to
stress that the command reads its data from the standard input.
* jc/show-index-h-update:
show-index: the short help should say the command reads from its input
commit 970fcdf59db2819f0c1c5269d631f2ede634782f
Merge: 97e76074b3 8ccc75c245
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:19:59 2025 -0800
Merge branch 'ps/3.0-remote-deprecation' into next
Following the procedure we established to introduce breaking
changes for Git 3.0, allow an early opt-in for removing support of
$GIT_DIR/branches/ and $GIT_DIR/remotes/ directories to configure
remotes.
* ps/3.0-remote-deprecation:
remote: announce removal of "branches/" and "remotes/"
builtin/pack-redundant: remove subcommand with breaking changes
ci: repurpose "linux-gcc" job for deprecations
ci: merge linux-gcc-default into linux-gcc
Makefile: wire up build option for deprecated features
commit 97e76074b304a8b886884172e017eb5cef1e1205
Merge: 9e0d6f9a5e 6979bf6f8f
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:19:58 2025 -0800
Merge branch 'jk/combine-diff-cleanup' into next
Code clean-up for code paths around combined diff.
* jk/combine-diff-cleanup:
tree-diff: make list tail-passing more explicit
tree-diff: simplify emit_path() list management
tree-diff: use the name "tail" to refer to list tail
tree-diff: drop list-tail argument to diff_tree_paths()
combine-diff: drop public declaration of combine_diff_path_size()
tree-diff: inline path_appendnew()
tree-diff: pass whole path string to path_appendnew()
tree-diff: drop path_appendnew() alloc optimization
run_diff_files(): de-mystify the size of combine_diff_path struct
diff: add a comment about combine_diff_path.parent.path
combine-diff: use pointer for parent paths
tree-diff: clear parent array in path_appendnew()
combine-diff: add combine_diff_path_new()
run_diff_files(): delay allocation of combine_diff_path
commit 9e0d6f9a5e2b0c6ffff4601b87cef921729ef81b
Merge: e3fc411f90 04292c3796
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 13:19:58 2025 -0800
Merge branch 'tb/unsafe-hash-cleanup' into next
The API around choosing to use unsafe variant of SHA-1
implementation has been updated in an attempt to make it harder to
abuse.
* tb/unsafe-hash-cleanup:
hash.h: drop unsafe_ function variants
csum-file: introduce hashfile_checkpoint_init()
t/helper/test-hash.c: use unsafe_hash_algo()
csum-file.c: use unsafe_hash_algo()
hash.h: introduce `unsafe_hash_algo()`
csum-file.c: extract algop from hashfile_checksum_valid()
csum-file: store the hash algorithm as a struct field
t/helper/test-tool: implement sha1-unsafe helper
commit e3fc411f907fa0fdb78ae63f0b28d2eff8c18265
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 28 10:19:06 2025 -0800
Fix mismerge at 737049d332
The world order after merging the bc/doc-adoc-not-txt topic
is that there is no .txt files in Documentation/ hierarchy,
as everything should have been migrated to .adoc suffix.
There were a fiew topics that were simultaneously in flight
that got graduated earlier than the topic, hence needed an
evil merge to adjust. This commit belatedly adjusts the merge
result to account for them. The same merge-fix will be made
when the topic eventually graduates to 'master'.
Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
commit 32a5e123542063f1611f72f5b717dc407e54d88a
Author: Salvatore Bonaccorso <carnil@debian.org>
Date: Sun Jan 19 13:43:44 2025 +0100
NMU for CVE-2024-50349 and CVE-2024-52006
I've prepared an NMU for git (versioned as 1:2.47.2-0.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
I'm not sure if you have concerns about the short delay but I
defintively strongly would prefer to have the update first exposed in
unstable, then go down to bookworm releasing the packages.
What I tried is to follow as close as possible your current pckaging
from a git clone merge the upstream v2.47.2 tag for the unstable
upload as this is a supported version.
Differently though for bookworm and cherry-picking there the commits
from the closest down version.
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit df1746335292fb91395158c8fcd8e1ff35292078
Merge: 2de766588e e1fbebe347
Author: Jonathan Nieder <jrnieder@gmail.com>
Date: Sun Jan 26 16:15:49 2025 +0100
Merge tag 'v2.47.2' into debian-sid
Git 2.47.2
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
commit d8f9f50db2bcc2e04354484c626dd889a9291dd8
Author: Calvin Wan <calvinwan@google.com>
Date: Fri Jan 24 18:32:42 2025 +0000
debian: new "next" snapshot
Change-Id: Id4f41179f933bfa865ce9774a3812815d1e18145
Signed-off-by: Calvin Wan <calvinwan@google.com>
commit 6fa99a6c101ba3303d21de8588a986e314eed7bf
Merge: 3c75dfe662 079036d154
Author: Calvin Wan <calvinwan@google.com>
Date: Fri Jan 24 18:32:11 2025 +0000
Merge branch 'next' into debian-experimental
Change-Id: I9137eb38964c649610805d4f71d73db2959e2017
Signed-off-by: Calvin Wan <calvinwan@google.com>
commit b27710019bdb95530e7c7a2659767cbd15f87f22
Merge: d02f3c8a9c 5f8f7081f7
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 24 08:16:28 2025 -0800
Sync with 'next'
commit d02f3c8a9c26bae5436580124cbd175cff4a56d1
Merge: 43464adc45 77b2d29e91
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 24 08:15:48 2025 -0800
Merge branch 'ja/doc-notes-markup-updates' into next
Doc mark-up updates.
* ja/doc-notes-markup-updates:
doc: convert git-notes to new documentation format
commit 43464adc45b4c749ca1136f2e500b0c0cb201603
Merge: ba5df28904 d11d003ba5
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 24 08:15:47 2025 -0800
Merge branch 'sk/strlen-returns-size_t' into next
Code clean-up.
* sk/strlen-returns-size_t:
date.c: Fix type missmatch warings from msvc
commit ba5df28904d1d3c6a60c03fd8a79dc1d632904ef
Merge: 737049d332 69666e6746
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 24 08:15:47 2025 -0800
Merge branch 'ja/doc-restore-markup-update' into next
Doc mark-up updates.
* ja/doc-restore-markup-update:
doc: convert git-restore to new style format
commit 737049d33235a7e1b5395cfdde28e09eb0c8b565
Merge: 079036d154 dd98f54f30
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 24 08:15:46 2025 -0800
Merge branch 'bc/doc-adoc-not-txt' into next
All the documentation .txt files have been renamed to .adoc to help
content aware editors.
* bc/doc-adoc-not-txt:
Remove obsolete ".txt" extensions for AsciiDoc files
doc: use .adoc extension for AsciiDoc files
gitattributes: mark AsciiDoc files as LF-only
editorconfig: add .adoc extension
doc: update gitignore for .adoc extension
commit 079036d154c003431f45b7bf2341a84351f260f4
Merge: 7dc4bdaea8 a0bea0978f
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:02:01 2025 -0800
Merge branch 'ps/reflog-migration-with-logall-fix' into next
The "git refs migrate" command did not migrate the reflog for
refs/stash, which is the contents of the stashes, which has been
corrected.
* ps/reflog-migration-with-logall-fix:
refs: fix migration of reflogs respecting "core.logAllRefUpdates"
commit 7dc4bdaea8fee93e3653ceed32d2d89d502d67cd
Merge: 123929bd42 2fd367cf63
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:02:01 2025 -0800
Merge branch 'am/trace2-with-valueless-true' into next
The trace2 code was not prepared to show a configuration variable
that is set to true using the valueless true syntax, which has been
corrected.
* am/trace2-with-valueless-true:
trace2: prevent segfault on config collection with valueless true
commit 123929bd4276504d953fb4c8be2773f46612ac30
Merge: 714518543f 3519492430
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:02:01 2025 -0800
Merge branch 'kn/reflog-symref-fix' into next
reflog entries for symbolic ref updates were broken, which has been
corrected.
* kn/reflog-symref-fix:
refs: fix creation of reflog entries for symrefs
commit 714518543f337d2b946562c0ba92b7ef742e0b7a
Merge: aa9235f015 c5490ce9d1
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:02:00 2025 -0800
Merge branch 'rs/ref-fitler-used-atoms-value-fix' into next
"git branch --sort=..." and "git for-each-ref --format=... --sort=..."
did not work as expected with some atoms, which has been corrected.
* rs/ref-fitler-used-atoms-value-fix:
ref-filter: remove ref_format_clear()
ref-filter: move is-base tip to used_atom
ref-filter: move ahead-behind bases into used_atom
commit aa9235f01514a80b262b3aaadc12432c1e503bb2
Merge: 1d3743f005 2a13745101
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:02:00 2025 -0800
Merge branch 'ja/doc-commit-markup-updates' into next
Doc updates.
* ja/doc-commit-markup-updates:
doc: migrate git-commit manpage secondary files to new format
doc: convert git commit config to new format
doc: make more direct explanations in git commit options
doc: the mode param of -u of git commit is optional
doc: apply new documentation guidelines to git commit
commit 1d3743f005324d61fd3635c9bc3963caef3aad4e
Merge: 3171845b73 b224e8e36c
Author: Junio C Hamano <gitster@pobox.com>
Date: Thu Jan 23 12:01:59 2025 -0800
Merge branch 'ds/path-walk-1' into next
Introduce a new API to visit objects in batches based on a common
path, or by type.
* ds/path-walk-1:
path-walk: drop redundant parse_tree() call
commit 3171845b731fb90dfa49d89be174ccc6dfbf5729
Merge: 20bc202378 71edf6c3c8
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 22 13:43:18 2025 -0800
Merge branch 'ds/path-walk-1' into next
Introduce a new API to visit objects in batches based on a common
path, or by type.
* ds/path-walk-1:
path-walk: reorder object visits
path-walk: mark trees and blobs as UNINTERESTING
path-walk: visit tags and cached objects
path-walk: allow consumer to specify object types
t6601: add helper for testing path-walk API
test-lib-functions: add test_cmp_sorted
path-walk: introduce an object walk by path
commit 20bc2023784191fecf708c40bc48d377ac85f7f0
Merge: a5ae1ce801 2d0ff147e5
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 22 13:43:18 2025 -0800
Merge branch 'jp/t8002-printf-fix' into next
Test fix.
* jp/t8002-printf-fix:
t8002: fix ambiguous printf conversion specifications
commit a5ae1ce8010b6f3e0f4c7f3b46debc3c84e04787
Merge: 51a22e98a1 33319b0976
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 22 13:43:17 2025 -0800
Merge branch 'ps/reftable-sign-compare' into next
THe reftable/ library code has been made -Wsign-compare clean.
* ps/reftable-sign-compare:
reftable: address trivial -Wsign-compare warnings
reftable/blocksource: adjust `read_block()` to return `ssize_t`
reftable/blocksource: adjust type of the block length
reftable/block: adjust type of the restart length
reftable/block: adapt header and footer size to return a `size_t`
reftable/basics: adjust `hash_size()` to return `uint32_t`
reftable/basics: adjust `common_prefix_size()` to return `size_t`
reftable/record: handle overflows when decoding varints
reftable/record: drop unused `print` function pointer
meson: stop disabling -Wsign-compare
commit 51a22e98a1c37d80c3150930dffd2ffcb128448d
Merge: bf1f004a4a 0b43274850
Author: Junio C Hamano <gitster@pobox.com>
Date: Wed Jan 22 13:43:17 2025 -0800
Merge branch 'mh/credential-cache-authtype-request-fix' into next
The "cache" credential back-end did not handle authtype correctly,
which has been corrected.
* mh/credential-cache-authtype-request-fix:
credential-cache: respect authtype capability
commit bf1f004a4abf2e01ffff8257b3d85971346078f1
Merge: 60017ef61a 4e746b1a31
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:46:03 2025 -0800
Sync with 'master'
commit 60017ef61a148b814867f3ca8f89f15a80916aaa
Merge: fe4e60a331 98046591b9
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:45:51 2025 -0800
Merge branch 'jk/pack-header-parse-alignment-fix' into next
It was possible for "git unpack-objects" and "git index-pack" to
make an unaligned access, which has been corrected.
* jk/pack-header-parse-alignment-fix:
index-pack, unpack-objects: use skip_prefix to avoid magic number
index-pack, unpack-objects: use get_be32() for reading pack header
parse_pack_header_option(): avoid unaligned memory writes
packfile: factor out --pack_header argument parsing
bswap.h: squelch potential sparse -Wcast-truncate warnings
commit fe4e60a33197d0b3e003cdc5ca1e94e6d092da89
Merge: 6d872e6042 8454b42f94
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:45:51 2025 -0800
Merge branch 'ps/build-meson-subtree' into next
THe meson-driven build is now aware of "git-subtree" housed in
contrib/subtree hierarchy.
* ps/build-meson-subtree:
meson: wire up the git-subtree(1) command
meson: introduce build option for contrib
contrib/subtree: fix building docs
commit 6d872e6042484f8883c097f9ee8cef34dc4c0629
Merge: 799bbc6b82 49b299215d
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:45:51 2025 -0800
Merge branch 'mh/connect-sign-compare' into next
The code in connect.c has been updated to work around complaints
from -Wsign-compare.
* mh/connect-sign-compare:
connect: address -Wsign-compare warnings
commit 799bbc6b82d223e23e2550aba4ccca4dec29d0c2
Merge: 5a17181a32 ffbd3f98f9
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:45:50 2025 -0800
Merge branch 'sk/unit-tests' into next
Move a few more unit tests to the clar test framework.
* sk/unit-tests:
t/unit-tests: convert reftable tree test to use clar test framework
t/unit-tests: adapt priority queue test to use clar test framework
t/unit-tests: convert mem-pool test to use clar test framework
t/unit-tests: handle dashes in test suite filenames
commit 5a17181a3224c5bf83ea61ce6d023896a190f071
Merge: 71f41b00d8 f66d1423f5
Author: Junio C Hamano <gitster@pobox.com>
Date: Tue Jan 21 08:45:50 2025 -0800
Merge branch 'jc/show-usage-help' into next
The help text from "git $cmd -h" appear on the standard output for
some $cmd and the standard error for others. The built-in commands
have been fixed to show them on the standard output consistently.
* jc/show-usage-help:
builtin: send usage() help text to standard output
oddballs: send usage() help text to standard output
builtins: send usage_with_options() help text to standard output
usage: add show_usage_if_asked()
parse-options: add show_usage_with_options_if_asked()
t0012: optionally check that "-h" output goes to stdout
commit 71f41b00d8cac733315206fddf476d8bed484a36
Merge: a70beabaf5 4ad47d2de3
Author: Junio C Hamano <gitster@pobox.com>
Date: Fri Jan 17 13:39:37 2025 -0800
Merge branch 'jc/cli-doc-option-and-config' into next
Doc update.
* jc/cli-doc-option-and-config:
gitcli: document that command line trumps config and env
![[bug history graph]](https://qa.debian.org/data/bts/graphs/g/git.png){kind=link}