mirror/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-18 01:54:19 +01:00
Code

Merge branch 'maint'

Browse Source 
* maint:
  read-tree --aggressive: remove deleted entry from the working tree.
This commit is contained in:
Junio C Hamano 2006-03-01 23:20:31 -08:00
commit 2486927d2e
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
read-tree.c
View File

@ -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.
*/