Git development
 help / color / mirror / Atom feed
* [PATCH 1/1] unpack-trees.c: verify_uptodate: remove dead code
@ 2007-05-20 17:26 skimo
  0 siblings, 0 replies; only message in thread
From: skimo @ 2007-05-20 17:26 UTC (permalink / raw)
  To: git, Junio C Hamano

From: Sven Verdoolaege <skimo@kotnet.org>

This code was killed by commit fcc387db9bc453dc7e07a262873481af2ee9e5c8.

Signed-off-by: Sven Verdoolaege <skimo@kotnet.org>
---
 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

^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2007-05-20 17:26 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-05-20 17:26 [PATCH 1/1] unpack-trees.c: verify_uptodate: remove dead code skimo

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox