admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

t: avoid git config syntax from newer releases

Browse Source 
In a recent security release, 05e9cd64ee (config: quote values
containing CR character, 2025-05-19) added calls to `git config get`,
`git config set`, and `git config unset` which are not present on the
maint-2.43 branch.

These subcommands were added in the following commits, released in
git-2.46.0:

  4e51389000 (builtin/config: introduce "get" subcommand, 2024-05-06),
  00bbdde141 (builtin/config: introduce "set" subcommand, 2024-05-06),
  95ea69c67b (builtin/config: introduce "unset" subcommand, 2024-05-06)

Revert to the previous `git config` syntax for older maintenance
branches.

Signed-off-by: Todd Zullinger <tmz@pobox.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Todd Zullinger
2025-07-08 17:05:27 -04:00
committed by Junio C Hamano
parent 05e9cd64ee
commit 428c9241c6
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
t/t1300-config.sh
View File

@@ -2595,8 +2595,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' '
printf "bar\r\n" >expect && printf "bar\r\n" >expect &&
git init cr-test && git init cr-test &&
git -C cr-test config set core.foo $(printf "bar\r") && git -C cr-test config core.foo $(printf "bar\r") &&
git -C cr-test config get core.foo >actual && git -C cr-test config --get core.foo >actual &&
test_cmp expect actual test_cmp expect actual
' '

4
t/t7450-bad-git-dotfiles.sh
View File

@@ -362,10 +362,10 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d
git -C repo mv sub $(printf "sub\r") && git -C repo mv sub $(printf "sub\r") &&
# Ensure config values containing CR are wrapped in quotes. # Ensure config values containing CR are wrapped in quotes.
git config unset -f repo/.gitmodules submodule.sub.path && git config --unset -f repo/.gitmodules submodule.sub.path &&
printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules && printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
git config unset -f repo/.git/modules/sub/config core.worktree && git config --unset -f repo/.git/modules/sub/config core.worktree &&
{ {
printf "[core]\n" && printf "[core]\n" &&
printf "\tworktree = \"../../../sub\r\"\n" printf "\tworktree = \"../../../sub\r\"\n"