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 ee10eea24cdd37d308066721c947b2d2449e786e..6d1f0d13a36cf4bcdc9e01d910866a6b624bbe6f 100644 (file)
--- 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);