From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 29 Aug 2008 20:40:36 +0000 (-0700)
Subject: checkout: do not check out unmerged higher stages randomly
X-Git-Tag: v1.6.0.2~12^2
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/8fdcf3125465f70c0cad5be5ab192d46e46307c7?ds=sidebyside;hp=8fdcf3125465f70c0cad5be5ab192d46e46307c7

checkout: do not check out unmerged higher stages randomly

During a conflicted merge when you have unmerged stages for a
path F in the index, if you said:

$ git checkout F

we rewrote F as many times as we have stages for it, and the
last one (typically "theirs") was left in the work tree, without
resolving the conflict.

This fixes it by noticing that a specified pathspec pattern
matches an unmerged path, and by erroring out.

Signed-off-by: Junio C Hamano <gitster@pobox.com>
---