Merge branch 'jk/xstrfmt'

diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 9d9498bd95c525b008bd3719c2debf87c66ebef2..23c0e357a765f00d807938fccf81a250c371ec4f 100755 (executable)
--- a/t/t4039-diff-assume-unchanged.sh
+++ b/t/t4039-diff-assume-unchanged.sh
@@ -28,4 +28,15 @@ test_expect_success 'diff-files does not examine assume-unchanged entries' '
        test -z "$(git diff-files -- one)"
 '
 
+test_expect_success POSIXPERM 'find-copies-harder is not confused by mode bits' '
+       echo content >exec &&
+       chmod +x exec &&
+       git add exec &&
+       git commit -m exec &&
+       git update-index --assume-unchanged exec &&
+       >expect &&
+       git diff-files --find-copies-harder -- exec >actual &&
+       test_cmp expect actual
+'
+
 test_done