Skip to content

Commit a98e34b

Browse files
committed
Merge branch 'maint-2.44' into maint-2.45
* maint-2.44: t: avoid git config syntax from newer releases
2 parents f94b90a + 09669c7 commit a98e34b

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
@@ -2743,8 +2743,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' '
27432743
27442744
printf "bar\r\n" >expect &&
27452745
git init cr-test &&
2746-
git -C cr-test config set core.foo $(printf "bar\r") &&
2747-
git -C cr-test config get core.foo >actual &&
2746+
git -C cr-test config core.foo $(printf "bar\r") &&
2747+
git -C cr-test config --get core.foo >actual &&
27482748
27492749
test_cmp expect actual
27502750
'

t/t7450-bad-git-dotfiles.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -388,10 +388,10 @@ test_expect_success SYMLINKS,!WINDOWS,!MINGW 'submodule must not checkout into d
388388
git -C repo mv sub $(printf "sub\r") &&
389389
390390
# Ensure config values containing CR are wrapped in quotes.
391-
git config unset -f repo/.gitmodules submodule.sub.path &&
391+
git config --unset -f repo/.gitmodules submodule.sub.path &&
392392
printf "\tpath = \"sub\r\"\n" >>repo/.gitmodules &&
393393
394-
git config unset -f repo/.git/modules/sub/config core.worktree &&
394+
git config --unset -f repo/.git/modules/sub/config core.worktree &&
395395
{
396396
printf "[core]\n" &&
397397
printf "\tworktree = \"../../../sub\r\"\n"

0 commit comments

Comments
 (0)