Skip to content

Commit 18e6be8

Browse files
committed
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
2 parents 7a1903a + 428c924 commit 18e6be8

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

t/t1300-config.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2595,8 +2595,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' '
25952595
25962596
printf "bar\r\n" >expect &&
25972597
git init cr-test &&
2598-
git -C cr-test config set core.foo $(printf "bar\r") &&
2599-
git -C cr-test config get core.foo >actual &&
2598+
git -C cr-test config core.foo $(printf "bar\r") &&
2599+
git -C cr-test config --get core.foo >actual &&
26002600
26012601
test_cmp expect actual
26022602
'

t/t7450-bad-git-dotfiles.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -362,10 +362,10 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d
362362
git -C repo mv sub $(printf "sub\r") &&
363363
364364
# Ensure config values containing CR are wrapped in quotes.
365-
git config unset -f repo/.gitmodules submodule.sub.path &&
365+
git config --unset -f repo/.gitmodules submodule.sub.path &&
366366
printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
367367
368-
git config unset -f repo/.git/modules/sub/config core.worktree &&
368+
git config --unset -f repo/.git/modules/sub/config core.worktree &&
369369
{
370370
printf "[core]\n" &&
371371
printf "\tworktree = \"../../../sub\r\"\n"

0 commit comments

Comments
 (0)