X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=read-tree.c;h=ca808739dba4235f0f8a5777ff4bbfe4443d1d27;hb=f8ff0c0641a14770a2214fffbd4271b1ea3a0d61;hp=4db154db2b4ff17f7a2a584799aa5980692efe9f;hpb=720d150c48fc35fca13c6dfb3c76d60e4ee83b87;p=git.git

diff --git a/read-tree.c b/read-tree.c
index 4db154db..ca808739 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
 
@@ -652,7 +655,7 @@ int main(int argc, char **argv)
 			die("failed to unpack tree object %s", arg);
 		stage++;
 	}
-	if (update && !merge)
+	if ((update||index_only) && !merge)
 		usage(read_tree_usage);
 	if (merge && !fn) {
 		if (stage < 2)