use parse_commit_or_die instead of custom message

diff --git a/builtin/show-branch.c b/builtin/show-branch.c
index 99ec4af224464f5c6c82599dcc4ca18b6abaa7f7..3afc79b2c3062ccd6ce3e61dadaac9fe33ff9575 100644 (file)
--- a/builtin/show-branch.c
+++ b/builtin/show-branch.c
@@ -227,8 +227,7 @@ static void join_revs(struct commit_list **list_p,
                        parents = parents->next;
                        if ((this_flag & flags) == flags)
                                continue;
-                       if (!p->object.parsed)
-                               parse_commit(p);
+                       parse_commit(p);
                        if (mark_seen(p, seen_p) && !still_interesting)
                                extra--;
                        p->object.flags |= flags;
@@ -673,8 +672,8 @@ int cmd_show_branch(int ac, const char **av, const char *prefix)
                OPT_SET_INT(0, "sparse", &dense,
                            N_("show merges reachable from only one tip"), 0),
                OPT_SET_INT(0, "date-order", &sort_order,
-                           N_("show commits where no parent comes before its "
-                              "children"),
+                           N_("topologically sort, maintaining date order "
+                              "where possible"),
                            REV_SORT_BY_COMMIT_DATE),
                { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
                            N_("show <n> most recent ref-log entries starting at "