kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

Merge branch 'maint' 

* maint:
  read-tree --aggressive: remove deleted entry from the working tree.
maint
Junio C Hamano 2006-03-01 23:20:31 -08:00
parent 70e1cca388 1142038098
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) || if ((head_deleted && remote_deleted) ||
(head_deleted && remote && remote_match) || (head_deleted && remote && remote_match) ||
(remote_deleted && head && head_match)) (remote_deleted && head && head_match)) {
if (index)
return deleted_entry(index, index);
return 0; return 0;

}
/* /*
* Added in both, identically. * Added in both, identically.
*/ */