path: root/unpack-trees.h
diff options
authorJunio C Hamano <>2008-09-08 02:49:25 (GMT)
committerJunio C Hamano <>2008-09-10 05:55:22 (GMT)
commit5521883490e85f4d973141972cf16f89a79f1979 (patch)
tree650ba77fc5225db197582c4adb7eac754059b698 /unpack-trees.h
parentaaefbfa66c348a461b3081873ef42819c8b38dac (diff)
checkout: do not lose staged removal
The logic to checkout a different commit implements the safety to never lose user's local changes. For example, switching from a commit to another commit, when you have changed a path that is different between them, need to merge your changes to the version from the switched-to commit, which you may not necessarily be able to resolve easily. By default, "git checkout" refused to switch branches, to give you a chance to stash your local changes (or use "-m" to merge, accepting the risks of getting conflicts). This safety, however, had one deliberate hole since early June 2005. When your local change was to remove a path (and optionally to stage that removal), the command checked out the path from the switched-to commit nevertheless. This was to allow an initial checkout to happen smoothly (e.g. an initial checkout is done by starting with an empty index and switching from the commit at the HEAD to the same commit). We can tighten the rule slightly to allow this special case to pass, without losing sight of removal explicitly done by the user, by noticing if the index is truly empty when the operation begins. For historical background, see: This case is marked as *0* in the message, which both Linus and I said "it feels somewhat wrong but otherwise we cannot start from an empty index". Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'unpack-trees.h')
1 files changed, 1 insertions, 0 deletions
diff --git a/unpack-trees.h b/unpack-trees.h
index 94e5672..0d26f3d 100644
--- a/unpack-trees.h
+++ b/unpack-trees.h
@@ -26,6 +26,7 @@ struct unpack_trees_options {
+ initial_checkout:1,
const char *prefix;
int pos;