From: Junio C Hamano <junkio@cox.net>
Date: Wed, 14 Sep 2005 05:27:42 +0000 (-0700)
Subject: read-tree: fix bogus debugging statement.
X-Git-Tag: v0.99.7~45
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=2ba6c47be1762726ad0c1d5779064c489150d789;p=git.git

read-tree: fix bogus debugging statement.

We wanted to detect case #16 which should be rare, but botched the
case when some paths are missing, causing a segfault.  My fault.

Signed-off-by: Junio C Hamano <junkio@cox.net>
---

diff --git a/read-tree.c b/read-tree.c
index 4db154db2..6a5c08c4c 100644
--- a/read-tree.c
+++ b/read-tree.c
@@ -362,12 +362,15 @@ static int keep_entry(struct cache_entry *ce)
 static void show_stage_entry(FILE *o,
 			     const char *label, const struct cache_entry *ce)
 {
-	fprintf(stderr, "%s%06o %s %d\t%s\n",
-		label,
-		ntohl(ce->ce_mode),
-		sha1_to_hex(ce->sha1),
-		ce_stage(ce),
-		ce->name);
+	if (!ce)
+		fprintf(o, "%s (missing)\n", label);
+	else
+		fprintf(o, "%s%06o %s %d\t%s\n",
+			label,
+			ntohl(ce->ce_mode),
+			sha1_to_hex(ce->sha1),
+			ce_stage(ce),
+			ce->name);
 }
 #endif