summaryrefslogtreecommitdiff
path: root/t/t4031-diff-rewrite-binary.sh
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2010-01-01 23:15:18 +0100
committerJunio C Hamano <gitster@pobox.com>2010-01-05 23:41:51 -0800
commit6396258368b76d432090c81096755dc1fbc89551 (patch)
tree9da3aee35fc2ea5281d680445fa2f66ffdffb1c5 /t/t4031-diff-rewrite-binary.sh
parent7ed7fac45a696ba6343707c7c8f4b268f309be32 (diff)
downloadgit-6396258368b76d432090c81096755dc1fbc89551.tar.gz
t4030, t4031: work around bogus MSYS bash path conversion
Recall that MSYS bash converts POSIX style absolute paths to Windows style absolute paths. Unfortunately, it converts a program argument that begins with a double-quote and otherwise looks like an absolute POSIX path, but in doing so, it strips everything past the second double-quote[*]. This case is triggered in the two test scripts. The work-around is to place the Windows style path returned by $(pwd) between the quotes to avoid the path conversion. [*] It is already bogus that a conversion is even considered when a program argument begins with a double-quote because it cannot be an absolute POSIX path. Signed-off-by: Johannes Sixt <j6t@kdbg.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4031-diff-rewrite-binary.sh')
-rwxr-xr-xt/t4031-diff-rewrite-binary.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4031-diff-rewrite-binary.sh b/t/t4031-diff-rewrite-binary.sh
index 27fb31b401..7e7b307a24 100755
--- a/t/t4031-diff-rewrite-binary.sh
+++ b/t/t4031-diff-rewrite-binary.sh
@@ -54,7 +54,7 @@ chmod +x dump
test_expect_success 'setup textconv' '
echo file diff=foo >.gitattributes &&
- git config diff.foo.textconv "\"$PWD\""/dump
+ git config diff.foo.textconv "\"$(pwd)\""/dump
'
test_expect_success 'rewrite diff respects textconv' '