@matheusbsbs / matheus-bagliano / commits / b8ba1535bd
Fork 0

Fix twoway_merge that passed d/f conflict marker to merged_entry().

When switching from one tree to another, we should not send a marker that says "this file does not exist in the new tree -- I am a placeholder to tell you that, and not a real blob" down to merged_entry() as the result of the merge.

Junio C Hamano committed Apr 2, 2007 at 16:29 UTC b8ba1535bda7bd553f46ea57bdbcee1c90e500a0
1 file changed +8 -2
unpack-trees.c
+8 -2
@@ -711,12 +711,18 @@ int twoway_merge(struct cache_entry **src,
711 struct unpack_trees_options *o)
712 {
713 struct cache_entry *current = src[0];
714 - struct cache_entry *oldtree = src[1], *newtree = src[2];
714 + struct cache_entry *oldtree = src[1];
715 + struct cache_entry *newtree = src[2];
716
717 if (o->merge_size != 2)
718 return error("Cannot do a twoway merge of %d trees",
719 o->merge_size);
720
721 + if (oldtree == o->df_conflict_entry)
722 + oldtree = NULL;
723 + if (newtree == o->df_conflict_entry)
724 + newtree = NULL;
725 +
726 if (current) {
727 if ((!oldtree && !newtree) || /* 4 and 5 */
728 (!oldtree && newtree &&
@@ -724,7 +730,7 @@ int twoway_merge(struct cache_entry **src,
730 (oldtree && newtree &&
731 same(oldtree, newtree)) || /* 14 and 15 */
732 (oldtree && newtree &&
727 - !same(oldtree, newtree) && /* 18 and 19*/
733 + !same(oldtree, newtree) && /* 18 and 19 */
734 same(current, newtree))) {
735 return keep_entry(current, o);
736 }