X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft4020-diff-external.sh;h=083f62d1d6bb6bfd908b0a03db1a47f80071ef91;hb=fc545433bdab7ec17e6609d2249771d407370a4d;hp=0720001281db6aeb5a3b6bb46cd6914ad7d78d33;hpb=77f143bf3e218857ec8e5244d7e862e8e0c1a041;p=git.git diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh index 072000128..083f62d1d 100755 --- a/t/t4020-diff-external.sh +++ b/t/t4020-diff-external.sh @@ -4,8 +4,6 @@ test_description='external diff interface test' . ./test-lib.sh -_z40=0000000000000000000000000000000000000000 - test_expect_success setup ' test_tick && @@ -136,6 +134,15 @@ test_expect_success 'GIT_EXTERNAL_DIFF with more than one changed files' ' GIT_EXTERNAL_DIFF=echo git diff ' +test_expect_success 'GIT_EXTERNAL_DIFF generates pretty paths' ' + touch file.ext && + git add file.ext && + echo with extension > file.ext && + GIT_EXTERNAL_DIFF=echo git diff file.ext | grep ......_file\.ext && + git update-index --force-remove file.ext && + rm file.ext +' + echo "#!$SHELL_PATH" >fake-diff.sh cat >> fake-diff.sh <<\EOF cat $2 >> crlfed.txt @@ -157,7 +164,7 @@ test_expect_success 'diff --cached' ' git update-index --assume-unchanged file && echo second >file && git diff --cached >actual && - test_cmp ../t4020/diff.NUL actual + test_cmp "$TEST_DIRECTORY"/t4020/diff.NUL actual ' test_done