Skip to content

Commit eaa76de

Browse files
j6tgitster
authored andcommitted
t5547-push-quarantine: run the path separator test on Windows, too
To perform the test case on Windows in a way that corresponds to the POSIX version, inject the semicolon in a directory name. Typically, an absolute POSIX style path, such as the one in $PWD, is translated into a Windows style path by bash when it invokes git.exe. However, the presence of the semicolon suppresses this translation; but the untranslated POSIX style path is useless for git.exe. Therefore, instead of $PWD pass the Windows style path that $(pwd) produces. Signed-off-by: Johannes Sixt <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent aae2ae4 commit eaa76de

File tree

1 file changed

+10
-4
lines changed

1 file changed

+10
-4
lines changed

t/t5547-push-quarantine.sh

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,7 @@ test_expect_success 'rejected objects are removed' '
3333
test_cmp expect actual
3434
'
3535

36-
# MINGW does not allow colons in pathnames in the first place
37-
test_expect_success !MINGW 'push to repo path with colon' '
36+
test_expect_success 'push to repo path with path separator (colon)' '
3837
# The interesting failure case here is when the
3938
# receiving end cannot access its original object directory,
4039
# so make it likely for us to generate a delta by having
@@ -43,13 +42,20 @@ test_expect_success !MINGW 'push to repo path with colon' '
4342
test-genrandom foo 4096 >file.bin &&
4443
git add file.bin &&
4544
git commit -m bin &&
46-
git clone --bare . xxx:yyy.git &&
45+
46+
if test_have_prereq MINGW
47+
then
48+
pathsep=";"
49+
else
50+
pathsep=":"
51+
fi &&
52+
git clone --bare . "xxx${pathsep}yyy.git" &&
4753
4854
echo change >>file.bin &&
4955
git commit -am change &&
5056
# Note that we have to use the full path here, or it gets confused
5157
# with the ssh host:path syntax.
52-
git push "$PWD/xxx:yyy.git" HEAD
58+
git push "$(pwd)/xxx${pathsep}yyy.git" HEAD
5359
'
5460

5561
test_done

0 commit comments

Comments
 (0)