Prettyprint octopus merge message.

[git.git] / show-branch.c

diff --git a/show-branch.c b/show-branch.c
index c117c53..8cc0755 100644 (file)
--- 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,