t1300: fix the new --show-origin tests on Windows
On Windows, we have that funny situation where the test script can refer to POSIX paths because it runs in a shell that uses a POSIX emulation layer ("MSYS2 runtime"). Yet, git.exe does *not* understand POSIX paths at all but only pure Windows paths. So let's just convert the POSIX paths to Windows paths before passing them on to Git, using `pwd` (which is already modified on Windows to output Windows paths). While fixing the new tests on Windows, we also have to exclude the tests that want to write a file with a name that is illegal on Windows (unfortunately, there is more than one test trying to make use of that file). Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Johannes Schindelin committed
Mar 23, 2016 at 11:55 UTC
45bf32971c067a542024a1b5f47fc26237baa713
1 file changed
+6
-3
t/t1300-repo-config.sh
+6
-3
@@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
1205
"die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
1206
'
1207
1208
+! test_have_prereq MINGW ||
1209
+HOME="$(pwd)" # convert to Windows path
1210
+
1211
test_expect_success 'set up --show-origin tests' '
1212
INCLUDE_DIR="$HOME/include" &&
1213
mkdir -p "$INCLUDE_DIR" &&
@@ -1304,7 +1307,7 @@ test_expect_success 'set up custom config file' '
1307
EOF
1308
'
1309
1307
-test_expect_success '--show-origin escape special file name characters' '
1310
+test_expect_success !MINGW '--show-origin escape special file name characters' '
1311
cat >expect <<-\EOF &&
1312
file:"file\" (dq) and spaces.conf" user.custom=true
1313
EOF
@@ -1333,7 +1336,7 @@ test_expect_success '--show-origin stdin with file include' '
1336
test_cmp expect output
1337
'
1338
1336
-test_expect_success '--show-origin blob' '
1339
+test_expect_success !MINGW '--show-origin blob' '
1340
cat >expect <<-\EOF &&
1341
blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08 user.custom=true
1342
EOF
@@ -1342,7 +1345,7 @@ test_expect_success '--show-origin blob' '
1345
test_cmp expect output
1346
'
1347
1345
-test_expect_success '--show-origin blob ref' '
1348
+test_expect_success !MINGW '--show-origin blob ref' '
1349
cat >expect <<-\EOF &&
1350
blob:"master:file\" (dq) and spaces.conf" user.custom=true
1351
EOF