]> git.ipfire.org Git - thirdparty/git.git/commit - combine-diff.c
diff -c -p: do not die on submodules
authorJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 19:49:52 +0000 (12:49 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 29 Apr 2009 19:49:52 +0000 (12:49 -0700)
commit7dae8b21c2fe39a59661c709f0dc17090dafa5a4
tree0063896a0043013e3b2ce8d3834586da5120d9d9
parentc922b01f54c4bebe84daeacf014cfbc8dc68479b
diff -c -p: do not die on submodules

The combine diff logic knew only about blobs (and their checked-out form
in the work tree, either regular files or symlinks), and barfed when fed
submodules.  This "externalizes" gitlinks in the same way as the normal
patch generation codepath does (i.e. "Subproject commit Xxx\n") to fix the
issue.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
combine-diff.c
t/t4027-diff-submodule.sh