Andrew's git
/
gitweb.git
/ diff
summary
|
log
|
commit
| diff |
tree
commit
grep
author
committer
pickaxe
?
re
Merge branch 'maint'
author
Junio C Hamano
<junkio@cox.net>
Thu, 2 Mar 2006 07:20:31 +0000
(23:20 -0800)
committer
Junio C Hamano
<junkio@cox.net>
Thu, 2 Mar 2006 07:20:31 +0000
(23:20 -0800)
* maint:
read-tree --aggressive: remove deleted entry from the working tree.
read-tree.c
patch
|
blob
|
history
raw
(from parent 1:
70e1cca
)
diff --git
a/read-tree.c
b/read-tree.c
index f39fe5ca653db7a4972cf99e790991c3d88495d0..c56b572d05266bb6eeae394184708d2075945d18 100644
(file)
--- a/
read-tree.c
+++ b/
read-tree.c
@@
-560,9
+560,11
@@
static int threeway_merge(struct cache_entry **stages)
*/
if ((head_deleted && remote_deleted) ||
(head_deleted && remote && remote_match) ||
- (remote_deleted && head && head_match))
+ (remote_deleted && head && head_match)) {
+ if (index)
+ return deleted_entry(index, index);
return 0;
-
+ }
/*
* Added in both, identically.
*/