summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2014-06-16 17:06:12 (GMT)
committerJunio C Hamano <gitster@pobox.com>2014-06-16 17:06:12 (GMT)
commit414405969e4b3ae7d278c2eaf1995c21cbfb5fdc (patch)
tree758844e07df3a6e414f2b39bf082986473339d13 /t
parent5b3a58d459171f49ee8d486e4ac399eb2678605d (diff)
parent530481004443a00fbf5ab477b36b90508b4dc59d (diff)
downloadgit-414405969e4b3ae7d278c2eaf1995c21cbfb5fdc.zip
git-414405969e4b3ae7d278c2eaf1995c21cbfb5fdc.tar.gz
git-414405969e4b3ae7d278c2eaf1995c21cbfb5fdc.tar.bz2
Merge branch 'jk/diff-files-assume-unchanged'
* jk/diff-files-assume-unchanged: run_diff_files: do not look at uninitialized stat data
Diffstat (limited to 't')
-rwxr-xr-xt/t4039-diff-assume-unchanged.sh11
1 files changed, 11 insertions, 0 deletions
diff --git a/t/t4039-diff-assume-unchanged.sh b/t/t4039-diff-assume-unchanged.sh
index 9d9498b..23c0e35 100755
--- 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