X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=unpack-trees.c;h=cac2411b9de7b4889abe6b0b84df25d24a38c7e5;hb=a2f8028d3d661b314d5a784764f2f5f9e4c2dde0;hp=906ce69ea6daf98cdb4f9dd3d6498264159b6b76;hpb=5610c6e381f54b7733d344010edc6ed20ec15761;p=git.git

diff --git a/unpack-trees.c b/unpack-trees.c
index 906ce69ea..cac2411b9 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -414,10 +414,6 @@ static void verify_uptodate(struct cache_entry *ce,
 			return;
 		errno = 0;
 	}
-	if (o->reset) {
-		ce->ce_flags |= htons(CE_UPDATE);
-		return;
-	}
 	if (errno == ENOENT)
 		return;
 	die("Entry '%s' not uptodate. Cannot merge.", ce->name);