projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: c9a8992) | patch
git-checkout -m: fix merge case
authorJunio C Hamano <junkio@cox.net>
Wed, 24 Jan 2007 00:51:22 +0000 (16:51 -0800)
committerJunio C Hamano <junkio@cox.net>
Wed, 24 Jan 2007 00:58:13 +0000 (16:58 -0800)
commitd7ebd53d371153f7a61c0fe9f384c9662b751bf6
tree08cd9a0e082f05c59109c3cbf029bd94488a1c2dtree | snapshot
parentc9a899256920b3266bb29f9d22bf6b9ab1b5a377commit | diff
git-checkout -m: fix merge case

Commit c1a4278e switched the "merging checkout" implementation
from 3-way read-tree to merge-recursive, but forgot that
merge-recursive will signal an unmerged state with its own exit
status code.  This prevented the clean-up phase (paths cleanly
merged should not be updated in the index) from running.

Signed-off-by: Junio C Hamano <junkio@cox.net>
git-checkout.sh diff | blob | history
t/t7201-co.sh diff | blob | history
Git—the stupid content tracker