From: Sven Verdoolaege <skimo@kotnet.org>
Date: Sun, 20 May 2007 17:26:37 +0000 (+0200)
Subject: unpack-trees.c: verify_uptodate: remove dead code
X-Git-Tag: v1.5.2.1~23^2~3
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=0a76f6652459e4bbf5311347e9bf726e203e86d6;p=git-core%2Fgit.git

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>
---

diff --git a/unpack-trees.c b/unpack-trees.c
index ee10eea24..6d1f0d13a 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);