mirror of
https://github.com/git/git.git
synced 2026-01-11 21:33:13 +09:00
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
This commit is contained in:
commit
18e6be837a
@ -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
|
||||
'
|
||||
|
||||
@ -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"
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user