diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-08 15:33:02 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-08 15:33:02 -0700 |
| commit | 09669c729af92144fde84e97d358759b5b42b555 (patch) | |
| tree | a9eeca38906f79f1346fb1217241eac2c0d51a9c | |
| parent | Git 2.44.4 (diff) | |
| parent | Merge branch 'tz/avoid-newer-config-syntax-in-older-maint-tracks' into maint-... (diff) | |
| download | git-09669c729af92144fde84e97d358759b5b42b555.tar.gz git-09669c729af92144fde84e97d358759b5b42b555.zip | |
Merge branch 'maint-2.43' into maint-2.44
* maint-2.43:
t: avoid git config syntax from newer releases
| -rwxr-xr-x | t/t1300-config.sh | 4 | ||||
| -rwxr-xr-x | t/t7450-bad-git-dotfiles.sh | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/t/t1300-config.sh b/t/t1300-config.sh index 206a6ecaea..6dbb6b6832 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2617,8 +2617,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' ' printf "bar\r\n" >expect && git init cr-test && - git -C cr-test config set core.foo $(printf "bar\r") && - git -C cr-test config get core.foo >actual && + git -C cr-test config core.foo $(printf "bar\r") && + git -C cr-test config --get core.foo >actual && test_cmp expect actual ' diff --git a/t/t7450-bad-git-dotfiles.sh b/t/t7450-bad-git-dotfiles.sh index ff63c05652..38b9db85cd 100755 --- a/t/t7450-bad-git-dotfiles.sh +++ b/t/t7450-bad-git-dotfiles.sh @@ -388,10 +388,10 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d git -C repo mv sub $(printf "sub\r") && # 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 && - 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 "\tworktree = \"../../../sub\r\"\n" |