Andrew's git
/
gitweb.git
/ blobdiff
summary
|
log
|
commit
|
diff
|
tree
commit
grep
author
committer
pickaxe
?
re
Allow one-way tree merge to remove old files
[gitweb.git]
/
read-tree.c
diff --git
a/read-tree.c
b/read-tree.c
index e926e4c880363469c5abf766127acc466fb5e438..11157f42426d7f1783420e1a5fa72379ee759e6a 100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-684,7
+684,7
@@
static int oneway_merge(struct cache_entry **src)
merge_size);
if (!a)
- return
0
;
+ return
deleted_entry(old, NULL)
;
if (old && same(old, a)) {
return keep_entry(old);
}