X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=cf6d28e2c9ee689a5ea49d715bc56773b266efa8;hb=b5b425074e5f84f261b1290b1a83eca635c49147;hp=8eb2432127e255347b2e6116d3f7ff57b4e06ba5;hpb=ccef66b55a6a2eb2c5f6a9dd29a86b181df21af9;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 8eb24321..cf6d28e2 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -218,11 +218,11 @@ static int oneway_merge(struct cache_entry **src, struct cache_entry **dst)
 
 	if (!a)
 		return 0;
-	if (old && same(old, a))
-		*a = *old;
-	a->ce_flags &= ~htons(CE_STAGEMASK);
-	*dst++ = a;
-	return 1;
+	if (old && same(old, a)) {
+		*dst++ = old;
+		return 1;
+	}
+	return merged_entry(a, NULL, dst);
 }
 
 static void check_updates(struct cache_entry **src, int nr)