Junio C Hamano ff00b682f2 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>

2011-07-13 21:39:18 -07:00

12 KiB

Executable File

Raw Blame History

View Raw