From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 14 Jul 2011 04:36:29 +0000 (-0700)
Subject: reset [<commit>] paths...: do not mishandle unmerged paths
X-Git-Tag: v1.7.6.1~20^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/ff00b682f203eb39876b57404916b4c54b6032c6?hp=ff00b682f203eb39876b57404916b4c54b6032c6

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>
---