aboutsummaryrefslogtreecommitdiff
path: root/t/t4039-diff-assume-unchanged.sh
diff options
context:
space:
mode:
authorJeff King <peff@peff.net>2014-05-14 18:13:06 -0400
committerJunio C Hamano <gitster@pobox.com>2014-05-15 09:35:33 -0700
commit530481004443a00fbf5ab477b36b90508b4dc59d (patch)
treecc4ced434e23cb906c74ed1615db883049991d6f /t/t4039-diff-assume-unchanged.sh
parent7bbc4e8fdb33e0a8e42e77cc05460d4c4f615f4d (diff)
downloadgit-530481004443a00fbf5ab477b36b90508b4dc59d.tar.gz
git-530481004443a00fbf5ab477b36b90508b4dc59d.tar.xz
run_diff_files: do not look at uninitialized stat data
If we try to diff an index entry marked CE_VALID (because it was marked with --assume-unchanged), we do not bother even running stat() on the file to see if it was removed. This started long ago with 540e694 (Prevent diff machinery from examining assume-unchanged entries on worktree, 2009-08-11). However, the subsequent code may look at our "struct stat" and expect to find actual data; currently it will find whatever cruft was left on the stack. This can cause problems in two situations: 1. We call match_stat_with_submodule with the stat data, so a submodule may be erroneously marked as changed. 2. If --find-copies-harder is in effect, we pass all entries, even unchanged ones, to diff_change, so it can list them as rename/copy sources. Since we found no change, we assume that function will realize it and not actually display any diff output. However, we end up feeding it a bogus mode, leading it to sometimes claim there was a mode change. We can fix both by splitting the CE_VALID and regular code paths, and making sure only to look at the stat information in the latter. Furthermore, we push the declaration of our "struct stat" down into the code paths that actually set it, so we cannot accidentally access it uninitialized in future code. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t4039-diff-assume-unchanged.sh')
-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 9d9498bd9..23c0e357a 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