Merge branch 'jc/maint-clean-nested-dir-safety' into maint

diff --git a/t/t4020-diff-external.sh b/t/t4020-diff-external.sh
index 0720001281db6aeb5a3b6bb46cd6914ad7d78d33..4ea42e00dad9bf15e221e6eac5d91748cb0a07e7 100755 (executable)
--- a/t/t4020-diff-external.sh
+++ b/t/t4020-diff-external.sh
@@ -136,6 +136,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