diff options
| author | Junio C Hamano <gitster@pobox.com> | 2025-07-08 15:31:56 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-07-08 15:31:56 -0700 |
| commit | 18e6be837a381f99523b238a0bb92179dc20b1ca (patch) | |
| tree | 7790251efa5374585cc92016b16cf898e3017b27 | |
| parent | Git 2.43.7 (diff) | |
| parent | t: avoid git config syntax from newer releases (diff) | |
| download | git-18e6be837a381f99523b238a0bb92179dc20b1ca.tar.gz git-18e6be837a381f99523b238a0bb92179dc20b1ca.zip | |
Merge branch 'tz/avoid-newer-config-syntax-in-older-maint-tracks' into maint-2.43
* tz/avoid-newer-config-syntax-in-older-maint-tracks:
t: avoid git config syntax from newer releases
Diffstat (limited to '')
| -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 1010410b7e..baf9b48231 100755 --- a/t/t1300-config.sh +++ b/t/t1300-config.sh @@ -2595,8 +2595,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 2026285566..d1546e3311 100755 --- a/t/t7450-bad-git-dotfiles.sh +++ b/t/t7450-bad-git-dotfiles.sh @@ -362,10 +362,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" |