diff options
| author |  Sven Verdoolaege <skimo@kotnet.org> | 2007-09-08 12:30:22 +0200 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-09 02:28:57 -0700 |
| commit | 5701115aa7cfe7edd57c2483085456a37e27a5ba (patch) | |
| tree | 9f7870a1f59c7a789b4d3a8845fb264dcdea940b /Documentation/git-merge.txt | |
| parent | git-svn: fix "Malformed network data" with svn:// servers (diff) | |
| download | tgif-5701115aa7cfe7edd57c2483085456a37e27a5ba.tar.xz | |
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>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions