Re: [PATCH 05/16] unpack-trees.c: verify_uptodate: remove dead code
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:43:11
skimo@liacs.nl writes:
quoted hunk ↗ jump to hunk
From: Sven Verdoolaege <redacted> This code was killed by commit fcc387db9bc453dc7e07a262873481af2ee9e5c8. Signed-off-by: Sven Verdoolaege <redacted> --- 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.783.gc7476-dirty
Hmmm. I am not absolutely sure if the fcc387db change was correct anymore, but in any case, this removal of dead code should not break anything. But this does not belong to your series either. Perhaps I should apply this to 'master' regardless of the rest of the series.