mirrors/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-11-17 22:44:49 +01:00
Code Activity

Merge branch 'jc/gitlink' into next

Browse source 
* jc/gitlink:
  read-tree: reorganize bind_merge code.
This commit is contained in:
Junio C Hamano 2006-05-17 03:16:50 -07:00
commit d882e1ac94
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
read-tree.c
View file

@ -690,7 +690,7 @@ static int twoway_merge(struct cache_entry **src)
* Bind merge.
*
* Keep the index entries at stage0, collapse stage1 but make sure
* stage0 does not have anything in prefix.
* stage0 does not have anything there.
*/
static int bind_merge(struct cache_entry **src)
{
@ -700,12 +700,12 @@ static int bind_merge(struct cache_entry **src)
if (merge_size != 1)
return error("Cannot do a bind merge of %d trees\n",
merge_size);
if (!a)
return merged_entry(old, NULL);
if (old)
if (a && old)
die("Entry '%s' overlaps. Cannot bind.", a->name);
return merged_entry(a, NULL);
if (!a)
return keep_entry(old);
else
return merged_entry(a, NULL);
}
/*