X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=show-branch.c;h=8cc0755e0af511fd2151daeaceb7bcd5a7ec28b3;hb=9048fe1c50499d562dcf73094f173b12bdb084c4;hp=c117c536da61af0fe2cb12a1257e4537eaef92e3;hpb=1f8af483df5ea7070c421489eff40ca8e508b778;p=git.git

diff --git a/show-branch.c b/show-branch.c
index c117c536..8cc0755e 100644
--- a/show-branch.c
+++ b/show-branch.c
@@ -196,8 +196,11 @@ static void show_one_commit(struct commit *commit)
 {
 	char pretty[128], *cp;
 	struct commit_name *name = commit->object.util;
-	pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
-			    pretty, sizeof(pretty));
+	if (commit->object.parsed)
+		pretty_print_commit(CMIT_FMT_ONELINE, commit->buffer, ~0,
+				    pretty, sizeof(pretty));
+	else
+		strcpy(pretty, "(unavailable)");
 	if (!strncmp(pretty, "[PATCH] ", 8))
 		cp = pretty + 8;
 	else
@@ -427,7 +430,7 @@ int main(int ac, char **av)
 		return show_independent(rev, num_rev, ref_name, rev_mask);
 
 	/* Show list; --more=-1 means list-only */
-	if (1 < num_rev) {
+	if (1 < num_rev || extra < 0) {
 		for (i = 0; i < num_rev; i++) {
 			int j;
 			int is_head = rev_is_head(head_path,