Skip to content

Commit

Permalink
unpack-trees.c: verify_uptodate: remove dead code
Browse files Browse the repository at this point in the history
This code was killed by commit fcc387d.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
  • Loading branch information
Sven Verdoolaege authored and Junio C Hamano committed May 20, 2007
1 parent 1472966 commit 0a76f66
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions unpack-trees.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit 0a76f66

Please sign in to comment.