| commit | d7ebd53d371153f7a61c0fe9f384c9662b751bf6 | |
| author | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 Jan 2007 00:51:22 +0000 (23 16:51 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Wed, 24 Jan 2007 00:58:13 +0000 (23 16:58 -0800) | ||
| tree | 08cd9a0e082f05c59109c3cbf029bd94488a1c2d | treesnapshot (tar.gz zip) |
| parent | c9a899256920b3266bb29f9d22bf6b9ab1b5a377 | commitdiff |
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>
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 | diffblobblamehistory | |
| t/t7201-co.sh | diffblobblamehistory |