diff options
author | Junio C Hamano <junkio@cox.net> | 2006-07-24 21:01:14 -0700 |
---|---|---|
committer | Junio C Hamano <junkio@cox.net> | 2006-07-24 21:01:14 -0700 |
commit | 325ba14e400d7f0df876a2ddc8e2c85d563313bd (patch) | |
tree | 2e7c9079ce95bb637019ebe176c4be7bf8e985c8 | |
parent | 83e12e51c1826b29b5ab2ebcfa13ed99ce98ee98 (diff) | |
parent | f8f0b1f0e7e96bf996c657d2c5c15e0ba3a4eeac (diff) | |
download | git-325ba14e400d7f0df876a2ddc8e2c85d563313bd.tar.gz git-325ba14e400d7f0df876a2ddc8e2c85d563313bd.tar.xz |
Merge branch 'jc/read-tree'
* jc/read-tree:
checkout -f failed to check out a file if an existing directory interfered.
-rw-r--r-- | builtin-read-tree.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |