Skip to content

Commit 09669c7

Browse files
committed
Merge branch 'maint-2.43' into maint-2.44
* maint-2.43: t: avoid git config syntax from newer releases
2 parents 080b728 + 18e6be8 commit 09669c7

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
@@ -2617,8 +2617,8 @@ test_expect_success 'writing value with trailing CR not stripped on read' '
26172617
26182618
printf "bar\r\n" >expect &&
26192619
git init cr-test &&
2620-
git -C cr-test config set core.foo $(printf "bar\r") &&
2621-
git -C cr-test config get core.foo >actual &&
2620+
git -C cr-test config core.foo $(printf "bar\r") &&
2621+
git -C cr-test config --get core.foo >actual &&
26222622
26232623
test_cmp expect actual
26242624
'

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)