projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: d28790d) | patch
reset [<commit>] paths...: do not mishandle unmerged paths
authorJunio C Hamano <gitster@pobox.com>
Thu, 14 Jul 2011 04:36:29 +0000 (21:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Thu, 14 Jul 2011 04:39:18 +0000 (21:39 -0700)
commitff00b682f203eb39876b57404916b4c54b6032c6
tree02a3db584eb73b44ccd2a4e719c77ca0ed2690e1tree | snapshot
parentd28790dc31ca1bcdca7254a6b9381b6c84e91271commit | diff
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>
builtin/reset.c diff | blob | history
diff-lib.c diff | blob | history
t/t7102-reset.sh diff | blob | history
Git—the stupid content tracker