undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix earlier mismerges.

Browse Source 
Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
Junio C Hamano 2006-06-04 00:10:48 -07:00
parent 0e84fb06a1
commit b266b123cd
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
builtin-read-tree.c
View File

@ -799,10 +799,8 @@ static int oneway_merge(struct cache_entry **src)
return error("Cannot do a oneway merge of %d trees", return error("Cannot do a oneway merge of %d trees",
merge_size); merge_size);
if (!a) { if (!a)
invalidate_ce_path(old);
return deleted_entry(old, old); return deleted_entry(old, old);
}
if (old && same(old, a)) { if (old && same(old, a)) {
if (reset) { if (reset) {
struct stat st; struct stat st;
@ -1034,7 +1032,7 @@ int cmd_read_tree(int argc, const char **argv, char **envp)
* valid cache-tree because the index must match exactly * valid cache-tree because the index must match exactly
* what came from the tree. * what came from the tree.
*/ */
if (trees && trees->item && (!merge || (stage == 2))) { if (trees && trees->item && !prefix && (!merge || (stage == 2))) {
cache_tree_free(&active_cache_tree); cache_tree_free(&active_cache_tree);
prime_cache_tree(); prime_cache_tree();
} }