diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:47:09 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-06-25 18:47:09 (GMT) |
| commit | 11aae3e1c17bca8e7057d99a071815ee3c526d16 (patch) | |
| tree | 171c65aac1ac30c1a0b9f65c83a18cf221de02ed /t | |
| parent | b659f8108562f931fcd0ecf900dd4da9ff831ce8 (diff) | |
| parent | 530481004443a00fbf5ab477b36b90508b4dc59d (diff) | |
| download | git-11aae3e1c17bca8e7057d99a071815ee3c526d16.zip git-11aae3e1c17bca8e7057d99a071815ee3c526d16.tar.gz git-11aae3e1c17bca8e7057d99a071815ee3c526d16.tar.bz2 | |
Merge branch 'jk/diff-files-assume-unchanged' into maint
"git diff --find-copies-harder" sometimes pretended as if the mode
bits have changed for paths that are marked with assume-unchanged
bit.
* jk/diff-files-assume-unchanged:
run_diff_files: do not look at uninitialized stat data
Diffstat (limited to 't')
| -rwxr-xr-x | t/t4039-diff-assume-unchanged.sh | 11 |
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 |