aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Verdoolaege <skimo@kotnet.org>2007-05-20 19:26:37 +0200
committerJunio C Hamano <junkio@cox.net>2007-05-20 14:40:41 -0700
commit0a76f6652459e4bbf5311347e9bf726e203e86d6 (patch)
treeaf12d1e151ad65ea4bee2467289708753da0da82
parent1472966c04103874096fb786657459ea6628e451 (diff)
downloadgit-0a76f6652459e4bbf5311347e9bf726e203e86d6.tar.gz
git-0a76f6652459e4bbf5311347e9bf726e203e86d6.tar.xz
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>
-rw-r--r--unpack-trees.c4
1 files changed, 0 insertions, 4 deletions
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);