diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-01 23:20:31 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-01 23:20:31 -0800 |
| commit | 2486927d2ec9cc05ed7589540d103382d3751c10 (patch) | |
| tree | 32314ed02888ff2493c181708b1939484b7b5b89 /read-tree.c | |
| parent | 70e1cca3886b2efac5bcd42065bde45395dd92c7 (diff) | |
| parent | 1142038098810a69e57d88554559e4e6116df177 (diff) | |
| download | git-2486927d2ec9cc05ed7589540d103382d3751c10.tar.gz | |
Merge branch 'maint'
* maint:
read-tree --aggressive: remove deleted entry from the working tree.
Diffstat (limited to 'read-tree.c')
| -rw-r--r-- | read-tree.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/read-tree.c b/read-tree.c index f39fe5ca65..c56b572d05 100644 --- 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. */ |