Skip to content

Commit

Permalink
t1300: fix the new --show-origin tests on Windows
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Johannes Schindelin authored and Junio C Hamano committed Mar 23, 2016
1 parent 2ec2021 commit 45bf329
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions t/t1300-repo-config.sh
Original file line number Diff line number Diff line change
Expand Up @@ -1205,6 +1205,9 @@ test_expect_success POSIXPERM,PERL 'preserves existing permissions' '
"die q(badrename) if ((stat(q(.git/config)))[2] & 07777) != 0600"
'

! test_have_prereq MINGW ||
HOME="$(pwd)" # convert to Windows path

test_expect_success 'set up --show-origin tests' '
INCLUDE_DIR="$HOME/include" &&
mkdir -p "$INCLUDE_DIR" &&
Expand Down Expand Up @@ -1304,7 +1307,7 @@ test_expect_success 'set up custom config file' '
EOF
'

test_expect_success '--show-origin escape special file name characters' '
test_expect_success !MINGW '--show-origin escape special file name characters' '
cat >expect <<-\EOF &&
file:"file\" (dq) and spaces.conf" user.custom=true
EOF
Expand Down Expand Up @@ -1333,7 +1336,7 @@ test_expect_success '--show-origin stdin with file include' '
test_cmp expect output
'

test_expect_success '--show-origin blob' '
test_expect_success !MINGW '--show-origin blob' '
cat >expect <<-\EOF &&
blob:a9d9f9e555b5c6f07cbe09d3f06fe3df11e09c08 user.custom=true
EOF
Expand All @@ -1342,7 +1345,7 @@ test_expect_success '--show-origin blob' '
test_cmp expect output
'

test_expect_success '--show-origin blob ref' '
test_expect_success !MINGW '--show-origin blob ref' '
cat >expect <<-\EOF &&
blob:"master:file\" (dq) and spaces.conf" user.custom=true
EOF
Expand Down

0 comments on commit 45bf329

Please sign in to comment.