diff options
| author |  Johannes Schindelin <Johannes.Schindelin@gmx.de> | 2007-09-17 01:24:57 +0100 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2007-09-16 18:20:10 -0700 |
| commit | ece7b74903007cee8d280573647243d46a6f3a95 (patch) | |
| tree | 768d9bc4eaf26d832cc4f566385055e20f19dd39 /combine-diff.c | |
| parent | Merge branch 'maint' of git://linux-nfs.org/~bfields/git into maint (diff) | |
| download | tgif-ece7b74903007cee8d280573647243d46a6f3a95.tar.xz | |
apply --index-info: fall back to current index for mode changes
"git diff" does not record index lines for pure mode changes (i.e. no
lines changed). Therefore, apply --index-info would call out a bogus
error.
Instead, fall back to reading the info from the current index.
Incidentally, this fixes an error where git-rebase would not rebase a
commit including a pure mode change, and changes requiring a threeway
merge.
Noticed and later tested by Chris Shoemaker.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'combine-diff.c')
0 files changed, 0 insertions, 0 deletions