kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint-2.44' into maint-2.45 

* maint-2.44:
  t: avoid git config syntax from newer releases
maint
Junio C Hamano 2025-07-08 15:35:35 -07:00
parent f94b90ad6e 09669c729a
commit a98e34b5a7
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
t/t1300-config.sh
View File

@ -2743,8 +2743,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
'

4
t/t7450-bad-git-dotfiles.sh
View File

@ -388,10 +388,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"