diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-03-02 00:02:27 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-03-02 00:02:27 -0800 |
| commit | df45467ec98aa1c532196732c96a62589223353e (patch) | |
| tree | e46769f742a59a9bc32f878cec51d286f6b3be11 /read-tree.c | |
| parent | 0c1fc940eeae051e890304c40d1e66a478afadc8 (diff) | |
| parent | 2beb3cdd18225be657849790ed845c4d367b760a (diff) | |
| download | git-df45467ec98aa1c532196732c96a62589223353e.tar.gz git-df45467ec98aa1c532196732c96a62589223353e.tar.xz | |
Merge branch 'master' into next
* master:
contrib/git-svn: use refs/remotes/git-svn instead of git-svn-HEAD
Merge branch 'maint'
read-tree --aggressive: remove deleted entry from the working tree.
Merge branch 'jc/tag'
Merge part of 'jc/diff'
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 f39fe5ca6..c56b572d0 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. */ |