diff options
| author | Junio C Hamano <gitster@pobox.com> | 2008-03-02 00:07:59 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2008-03-02 01:08:34 -0800 |
| commit | 2b459b483cb264d3e9a39cd7857da2ccab08179f (patch) | |
| tree | 86f39276b7ff7f358024bdd527d0de6723dc50cc /diff.c | |
| parent | c8c16f2865f7c9c0d59b31ce66d50a4ecae72fd0 (diff) | |
| download | git-2b459b483cb264d3e9a39cd7857da2ccab08179f.tar.gz | |
diff: make sure work tree side is shown as 0{40} when different
Ping Yin noticed that "git diff-index --raw" shows 0{40} when work tree
has submodule difference, but "git diff --raw" didn't correctly do so.
There was a mistake in the diffcore_skip_stat_unmatch() that was meant to
clean up the stat-only difference for running diff between the index and
work tree and diff between the tree and the work tree, to cause it re-read
from the submodule repository HEAD. When ce_stat_match() says work tree
is different, we should always say 0{40} on the work tree side.
This patch fixes the issue, and adds tests.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 7 |
1 files changed, 2 insertions, 5 deletions
@@ -3187,11 +3187,8 @@ static void diffcore_apply_filter(const char *filter) static int diff_filespec_is_identical(struct diff_filespec *one, struct diff_filespec *two) { - if (S_ISGITLINK(one->mode)) { - diff_fill_sha1_info(one); - diff_fill_sha1_info(two); - return !hashcmp(one->sha1, two->sha1); - } + if (S_ISGITLINK(one->mode)) + return 0; if (diff_populate_filespec(one, 0)) return 0; if (diff_populate_filespec(two, 0)) |