From: Junio C Hamano <junkio@cox.net>
Date: Mon, 17 Jul 2006 06:25:12 +0000 (-0700)
Subject: checkout -f failed to check out a file if an existing directory interfered.
X-Git-Tag: v1.4.2-rc2~7^2
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=f8f0b1f0e7e96bf996c657d2c5c15e0ba3a4eeac;p=git.git

checkout -f failed to check out a file if an existing directory interfered.

When path foo/bar existed in the working tree, checkout -f to switch to
a branch that has a file foo silently did a wrong thing.  It failed to
remove the directory foo, did not check out the file foo, and the worst
of all it did not report any errors.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/builtin-read-tree.c b/builtin-read-tree.c
index 6df5d7c5c..122b6f130 100644
--- a/builtin-read-tree.c
+++ b/builtin-read-tree.c
@@ -507,7 +507,7 @@ static int merged_entry(struct cache_entry *merge, struct cache_entry *old)
 	}
 
 	merge->ce_flags &= ~htons(CE_STAGEMASK);
-	add_cache_entry(merge, ADD_CACHE_OK_TO_ADD);
+	add_cache_entry(merge, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
 	return 1;
 }
 
@@ -518,7 +518,7 @@ static int deleted_entry(struct cache_entry *ce, struct cache_entry *old)
 	else
 		verify_absent(ce->name, "removed");
 	ce->ce_mode = 0;
-	add_cache_entry(ce, ADD_CACHE_OK_TO_ADD);
+	add_cache_entry(ce, ADD_CACHE_OK_TO_ADD|ADD_CACHE_OK_TO_REPLACE);
 	invalidate_ce_path(ce);
 	return 1;
 }