| commit | ff00b682f203eb39876b57404916b4c54b6032c6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Jul 2011 04:36:29 +0000 (13 21:36 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 14 Jul 2011 04:39:18 +0000 (13 21:39 -0700) | ||
| tree | 02a3db584eb73b44ccd2a4e719c77ca0ed2690e1 | treesnapshot (tar.gz zip) |
| parent | d28790dc31ca1bcdca7254a6b9381b6c84e91271 | commitdiff |
reset [<commit>] paths...: do not mishandle unmerged paths
Because "diff --cached HEAD" showed an incorrect blob object name on the
LHS of the diff, we ended up updating the index entry with bogus value,
not what we read from the tree.
Noticed by John Nowak.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Because "diff --cached HEAD" showed an incorrect blob object name on the
LHS of the diff, we ended up updating the index entry with bogus value,
not what we read from the tree.
Noticed by John Nowak.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| builtin/reset.c | diffblobblamehistory | |
| diff-lib.c | diffblobblamehistory | |
| t/t7102-reset.sh | diffblobblamehistory |