author | Junio C Hamano <gitster@pobox.com> | |
Sun, 2 Mar 2008 08:07:59 +0000 (00:07 -0800) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 2 Mar 2008 09:08:34 +0000 (01:08 -0800) | ||
commit | 2b459b483cb264d3e9a39cd7857da2ccab08179f | |
tree | 86f39276b7ff7f358024bdd527d0de6723dc50cc | tree | snapshot |
parent | c8c16f2865f7c9c0d59b31ce66d50a4ecae72fd0 | commit | diff |
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>
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>
diff.c | diff | blob | history | |
t/t4027-diff-submodule.sh | [new file with mode: 0755] | blob |