X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=e59d144d28164f2451784513105f6269f0e9167c;hb=1689c5de8730ea334535337a341db3c7a21ad002;hp=ef21c62195d61980d4727e3f6d9c285422fcfe91;hpb=c7f72248e3da96299d925aece0f00a46f5f86334;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index ef21c6219..e59d144d2 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -941,8 +941,17 @@ int twoway_merge(struct cache_entry **src, struct unpack_trees_options *o)
 			return -1;
 		}
 	}
-	else if (newtree)
+	else if (newtree) {
+		if (oldtree && !o->initial_checkout) {
+			/*
+			 * deletion of the path was staged;
+			 */
+			if (same(oldtree, newtree))
+				return 1;
+			return reject_merge(oldtree, o);
+		}
 		return merged_entry(newtree, current, o);
+	}
 	return deleted_entry(oldtree, current, o);
 }