From: skimo@liacs.nl Date: Sun, 20 May 2007 17:26:37 GMT Subject: [PATCH 1/1] unpack-trees.c: verify_uptodate: remove dead code Message-ID: <11796819972973-git-send-email-skimo@liacs.nl> From: Sven Verdoolaege This code was killed by commit fcc387db9bc453dc7e07a262873481af2ee9e5c8. Signed-off-by: Sven Verdoolaege --- unpack-trees.c | 4 ---- 1 files changed, 0 insertions(+), 4 deletions(-) diff --git a/unpack-trees.c b/unpack-trees.c index 906ce69..cac2411 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); -- 1.5.2.rc3.819.gc901