From 0a76f6652459e4bbf5311347e9bf726e203e86d6 Mon Sep 17 00:00:00 2001
From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sun, 20 May 2007 19:26:37 +0200
Subject: [PATCH] unpack-trees.c: verify_uptodate: remove dead code

This code was killed by commit fcc387db9bc453dc7e07a262873481af2ee9e5c8.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
---
 unpack-trees.c | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/unpack-trees.c b/unpack-trees.c
index ee10eea24c..6d1f0d13a3 100644
--- a/unpack-trees.c
+++ b/unpack-trees.c
@@ -452,10 +452,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);
-- 
2.11.4.GIT