author | Sven Verdoolaege <skimo@kotnet.org> | |
Sat, 8 Sep 2007 10:30:22 +0000 (12:30 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Sun, 9 Sep 2007 09:28:57 +0000 (02:28 -0700) | ||
commit | 5701115aa7cfe7edd57c2483085456a37e27a5ba | |
tree | 9f7870a1f59c7a789b4d3a8845fb264dcdea940b | tree | snapshot |
parent | a51cdb0c0420ee3bef26bbd1a9aa75e1d464e5b7 | commit | diff |
git-diff: don't squelch the new SHA1 in submodule diffs
The code to squelch empty diffs introduced by commit
fb13227e089f22dc31a3b1624559153821056848 would inadvertently
populate filespec "two" of a submodule change using the uninitialized
(null) SHA1, thereby replacing the submodule SHA1 by 0{40} in the output.
This change teaches diffcore_skip_stat_unmatch to handle
submodule changes correctly.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
The code to squelch empty diffs introduced by commit
fb13227e089f22dc31a3b1624559153821056848 would inadvertently
populate filespec "two" of a submodule change using the uninitialized
(null) SHA1, thereby replacing the submodule SHA1 by 0{40} in the output.
This change teaches diffcore_skip_stat_unmatch to handle
submodule changes correctly.
Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
diff.c | diff | blob | history | |
t/t7400-submodule-basic.sh | diff | blob | history |