6 #include "parse-options.h"
 
   8 static const char* show_branch_usage[] = {
 
   9     N_("git show-branch [-a|--all] [-r|--remotes] [--topo-order | --date-order] [--current] [--color[=<when>] | --no-color] [--sparse] [--more=<n> | --list | --independent | --merge-base] [--no-name | --sha1-name] [--topics] [(<rev> | <glob>)...]"),
 
  10     N_("git show-branch (-g|--reflog)[=<n>[,<base>]] [--list] [<ref>]"),
 
  14 static int showbranch_use_color = -1;
 
  16 static int default_num;
 
  17 static int default_alloc;
 
  18 static const char **default_arg;
 
  20 #define UNINTERESTING   01
 
  23 #define MAX_REVS        (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
 
  25 #define DEFAULT_REFLOG  4
 
  27 static const char *get_color_code(int idx)
 
  29         if (want_color(showbranch_use_color))
 
  30                 return column_colors_ansi[idx % column_colors_ansi_max];
 
  34 static const char *get_color_reset_code(void)
 
  36         if (want_color(showbranch_use_color))
 
  37                 return GIT_COLOR_RESET;
 
  41 static struct commit *interesting(struct commit_list *list)
 
  44                 struct commit *commit = list->item;
 
  46                 if (commit->object.flags & UNINTERESTING)
 
  53 static struct commit *pop_one_commit(struct commit_list **list_p)
 
  55         struct commit *commit;
 
  56         struct commit_list *list;
 
  65         const char *head_name; /* which head's ancestor? */
 
  66         int generation; /* how many parents away from head_name */
 
  69 /* Name the commit as nth generation ancestor of head_name;
 
  70  * we count only the first-parent relationship for naming purposes.
 
  72 static void name_commit(struct commit *commit, const char *head_name, int nth)
 
  74         struct commit_name *name;
 
  76                 commit->util = xmalloc(sizeof(struct commit_name));
 
  78         name->head_name = head_name;
 
  79         name->generation = nth;
 
  82 /* Parent is the first parent of the commit.  We may name it
 
  83  * as (n+1)th generation ancestor of the same head_name as
 
  84  * commit is nth generation ancestor of, if that generation
 
  85  * number is better than the name it already has.
 
  87 static void name_parent(struct commit *commit, struct commit *parent)
 
  89         struct commit_name *commit_name = commit->util;
 
  90         struct commit_name *parent_name = parent->util;
 
  94             commit_name->generation + 1 < parent_name->generation)
 
  95                 name_commit(parent, commit_name->head_name,
 
  96                             commit_name->generation + 1);
 
  99 static int name_first_parent_chain(struct commit *c)
 
 108                 p = c->parents->item;
 
 120 static void name_commits(struct commit_list *list,
 
 125         struct commit_list *cl;
 
 129         /* First give names to the given heads */
 
 130         for (cl = list; cl; cl = cl->next) {
 
 134                 for (i = 0; i < num_rev; i++) {
 
 136                                 name_commit(c, ref_name[i], 0);
 
 142         /* Then commits on the first parent ancestry chain */
 
 145                 for (cl = list; cl; cl = cl->next) {
 
 146                         i += name_first_parent_chain(cl->item);
 
 150         /* Finally, any unnamed commits */
 
 153                 for (cl = list; cl; cl = cl->next) {
 
 154                         struct commit_list *parents;
 
 155                         struct commit_name *n;
 
 161                         parents = c->parents;
 
 164                                 struct commit *p = parents->item;
 
 165                                 struct strbuf newname = STRBUF_INIT;
 
 166                                 parents = parents->next;
 
 170                                 switch (n->generation) {
 
 172                                         strbuf_addstr(&newname, n->head_name);
 
 175                                         strbuf_addf(&newname, "%s^", n->head_name);
 
 178                                         strbuf_addf(&newname, "%s~%d",
 
 179                                                     n->head_name, n->generation);
 
 183                                         strbuf_addch(&newname, '^');
 
 185                                         strbuf_addf(&newname, "^%d", nth);
 
 186                                 name_commit(p, strbuf_detach(&newname, NULL), 0);
 
 188                                 name_first_parent_chain(p);
 
 194 static int mark_seen(struct commit *commit, struct commit_list **seen_p)
 
 196         if (!commit->object.flags) {
 
 197                 commit_list_insert(commit, seen_p);
 
 203 static void join_revs(struct commit_list **list_p,
 
 204                       struct commit_list **seen_p,
 
 205                       int num_rev, int extra)
 
 207         int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
 
 208         int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
 
 211                 struct commit_list *parents;
 
 212                 int still_interesting = !!interesting(*list_p);
 
 213                 struct commit *commit = pop_one_commit(list_p);
 
 214                 int flags = commit->object.flags & all_mask;
 
 216                 if (!still_interesting && extra <= 0)
 
 219                 mark_seen(commit, seen_p);
 
 220                 if ((flags & all_revs) == all_revs)
 
 221                         flags |= UNINTERESTING;
 
 222                 parents = commit->parents;
 
 225                         struct commit *p = parents->item;
 
 226                         int this_flag = p->object.flags;
 
 227                         parents = parents->next;
 
 228                         if ((this_flag & flags) == flags)
 
 231                         if (mark_seen(p, seen_p) && !still_interesting)
 
 233                         p->object.flags |= flags;
 
 234                         commit_list_insert_by_date(p, list_p);
 
 239          * Postprocess to complete well-poisoning.
 
 241          * At this point we have all the commits we have seen in
 
 242          * seen_p list.  Mark anything that can be reached from
 
 243          * uninteresting commits not interesting.
 
 247                 struct commit_list *s;
 
 248                 for (s = *seen_p; s; s = s->next) {
 
 249                         struct commit *c = s->item;
 
 250                         struct commit_list *parents;
 
 252                         if (((c->object.flags & all_revs) != all_revs) &&
 
 253                             !(c->object.flags & UNINTERESTING))
 
 256                         /* The current commit is either a merge base or
 
 257                          * already uninteresting one.  Mark its parents
 
 258                          * as uninteresting commits _only_ if they are
 
 259                          * already parsed.  No reason to find new ones
 
 262                         parents = c->parents;
 
 264                                 struct commit *p = parents->item;
 
 265                                 parents = parents->next;
 
 266                                 if (!(p->object.flags & UNINTERESTING)) {
 
 267                                         p->object.flags |= UNINTERESTING;
 
 277 static void show_one_commit(struct commit *commit, int no_name)
 
 279         struct strbuf pretty = STRBUF_INIT;
 
 280         const char *pretty_str = "(unavailable)";
 
 281         struct commit_name *name = commit->util;
 
 283         if (commit->object.parsed) {
 
 284                 pp_commit_easy(CMIT_FMT_ONELINE, commit, &pretty);
 
 285                 pretty_str = pretty.buf;
 
 287         if (!prefixcmp(pretty_str, "[PATCH] "))
 
 291                 if (name && name->head_name) {
 
 292                         printf("[%s", name->head_name);
 
 293                         if (name->generation) {
 
 294                                 if (name->generation == 1)
 
 297                                         printf("~%d", name->generation);
 
 303                                find_unique_abbrev(commit->object.sha1,
 
 307         strbuf_release(&pretty);
 
 310 static char *ref_name[MAX_REVS + 1];
 
 311 static int ref_name_cnt;
 
 313 static const char *find_digit_prefix(const char *s, int *v)
 
 320              '0' <= (ch = *p) && ch <= '9';
 
 322                 ver = ver * 10 + ch - '0';
 
 328 static int version_cmp(const char *a, const char *b)
 
 333                 a = find_digit_prefix(a, &va);
 
 334                 b = find_digit_prefix(b, &vb);
 
 341                         if ('0' <= ca && ca <= '9')
 
 343                         if ('0' <= cb && cb <= '9')
 
 357 static int compare_ref_name(const void *a_, const void *b_)
 
 359         const char * const*a = a_, * const*b = b_;
 
 360         return version_cmp(*a, *b);
 
 363 static void sort_ref_range(int bottom, int top)
 
 365         qsort(ref_name + bottom, top - bottom, sizeof(ref_name[0]),
 
 369 static int append_ref(const char *refname, const unsigned char *sha1,
 
 372         struct commit *commit = lookup_commit_reference_gently(sha1, 1);
 
 379                 /* Avoid adding the same thing twice */
 
 380                 for (i = 0; i < ref_name_cnt; i++)
 
 381                         if (!strcmp(refname, ref_name[i]))
 
 384         if (MAX_REVS <= ref_name_cnt) {
 
 385                 warning("ignoring %s; cannot handle more than %d refs",
 
 389         ref_name[ref_name_cnt++] = xstrdup(refname);
 
 390         ref_name[ref_name_cnt] = NULL;
 
 394 static int append_head_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 
 396         unsigned char tmp[20];
 
 398         if (prefixcmp(refname, "refs/heads/"))
 
 400         /* If both heads/foo and tags/foo exists, get_sha1 would
 
 403         if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
 
 405         return append_ref(refname + ofs, sha1, 0);
 
 408 static int append_remote_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 
 410         unsigned char tmp[20];
 
 412         if (prefixcmp(refname, "refs/remotes/"))
 
 414         /* If both heads/foo and tags/foo exists, get_sha1 would
 
 417         if (get_sha1(refname + ofs, tmp) || hashcmp(tmp, sha1))
 
 419         return append_ref(refname + ofs, sha1, 0);
 
 422 static int append_tag_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 
 424         if (prefixcmp(refname, "refs/tags/"))
 
 426         return append_ref(refname + 5, sha1, 0);
 
 429 static const char *match_ref_pattern = NULL;
 
 430 static int match_ref_slash = 0;
 
 431 static int count_slash(const char *s)
 
 440 static int append_matching_ref(const char *refname, const unsigned char *sha1, int flag, void *cb_data)
 
 442         /* we want to allow pattern hold/<asterisk> to show all
 
 443          * branches under refs/heads/hold/, and v0.99.9? to show
 
 444          * refs/tags/v0.99.9a and friends.
 
 447         int slash = count_slash(refname);
 
 448         for (tail = refname; *tail && match_ref_slash < slash; )
 
 453         if (fnmatch(match_ref_pattern, tail, 0))
 
 455         if (!prefixcmp(refname, "refs/heads/"))
 
 456                 return append_head_ref(refname, sha1, flag, cb_data);
 
 457         if (!prefixcmp(refname, "refs/tags/"))
 
 458                 return append_tag_ref(refname, sha1, flag, cb_data);
 
 459         return append_ref(refname, sha1, 0);
 
 462 static void snarf_refs(int head, int remotes)
 
 465                 int orig_cnt = ref_name_cnt;
 
 466                 for_each_ref(append_head_ref, NULL);
 
 467                 sort_ref_range(orig_cnt, ref_name_cnt);
 
 470                 int orig_cnt = ref_name_cnt;
 
 471                 for_each_ref(append_remote_ref, NULL);
 
 472                 sort_ref_range(orig_cnt, ref_name_cnt);
 
 476 static int rev_is_head(char *head, int headlen, char *name,
 
 477                        unsigned char *head_sha1, unsigned char *sha1)
 
 480             (head_sha1 && sha1 && hashcmp(head_sha1, sha1)))
 
 482         if (!prefixcmp(head, "refs/heads/"))
 
 484         if (!prefixcmp(name, "refs/heads/"))
 
 486         else if (!prefixcmp(name, "heads/"))
 
 488         return !strcmp(head, name);
 
 491 static int show_merge_base(struct commit_list *seen, int num_rev)
 
 493         int all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
 
 494         int all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
 
 498                 struct commit *commit = pop_one_commit(&seen);
 
 499                 int flags = commit->object.flags & all_mask;
 
 500                 if (!(flags & UNINTERESTING) &&
 
 501                     ((flags & all_revs) == all_revs)) {
 
 502                         puts(sha1_to_hex(commit->object.sha1));
 
 504                         commit->object.flags |= UNINTERESTING;
 
 510 static int show_independent(struct commit **rev,
 
 513                             unsigned int *rev_mask)
 
 517         for (i = 0; i < num_rev; i++) {
 
 518                 struct commit *commit = rev[i];
 
 519                 unsigned int flag = rev_mask[i];
 
 521                 if (commit->object.flags == flag)
 
 522                         puts(sha1_to_hex(commit->object.sha1));
 
 523                 commit->object.flags |= UNINTERESTING;
 
 528 static void append_one_rev(const char *av)
 
 530         unsigned char revkey[20];
 
 531         if (!get_sha1(av, revkey)) {
 
 532                 append_ref(av, revkey, 0);
 
 535         if (strchr(av, '*') || strchr(av, '?') || strchr(av, '[')) {
 
 536                 /* glob style match */
 
 537                 int saved_matches = ref_name_cnt;
 
 538                 match_ref_pattern = av;
 
 539                 match_ref_slash = count_slash(av);
 
 540                 for_each_ref(append_matching_ref, NULL);
 
 541                 if (saved_matches == ref_name_cnt &&
 
 542                     ref_name_cnt < MAX_REVS)
 
 543                         error("no matching refs with %s", av);
 
 544                 if (saved_matches + 1 < ref_name_cnt)
 
 545                         sort_ref_range(saved_matches, ref_name_cnt);
 
 548         die("bad sha1 reference %s", av);
 
 551 static int git_show_branch_config(const char *var, const char *value, void *cb)
 
 553         if (!strcmp(var, "showbranch.default")) {
 
 555                         return config_error_nonbool(var);
 
 557                  * default_arg is now passed to parse_options(), so we need to
 
 558                  * mimic the real argv a bit better.
 
 562                         default_arg = xcalloc(default_alloc, sizeof(*default_arg));
 
 563                         default_arg[default_num++] = "show-branch";
 
 564                 } else if (default_alloc <= default_num + 1) {
 
 565                         default_alloc = default_alloc * 3 / 2 + 20;
 
 566                         default_arg = xrealloc(default_arg, sizeof *default_arg * default_alloc);
 
 568                 default_arg[default_num++] = xstrdup(value);
 
 569                 default_arg[default_num] = NULL;
 
 573         if (!strcmp(var, "color.showbranch")) {
 
 574                 showbranch_use_color = git_config_colorbool(var, value);
 
 578         return git_color_default_config(var, value, cb);
 
 581 static int omit_in_dense(struct commit *commit, struct commit **rev, int n)
 
 583         /* If the commit is tip of the named branches, do not
 
 585          * Otherwise, if it is a merge that is reachable from only one
 
 586          * tip, it is not that interesting.
 
 589         for (i = 0; i < n; i++)
 
 590                 if (rev[i] == commit)
 
 592         flag = commit->object.flags;
 
 593         for (i = count = 0; i < n; i++) {
 
 594                 if (flag & (1u << (i + REV_SHIFT)))
 
 602 static int reflog = 0;
 
 604 static int parse_reflog_param(const struct option *opt, const char *arg,
 
 608         const char **base = (const char **)opt->value;
 
 611         reflog = strtoul(arg, &ep, 10);
 
 615                 return error("unrecognized reflog param '%s'", arg);
 
 619                 reflog = DEFAULT_REFLOG;
 
 623 int cmd_show_branch(int ac, const char **av, const char *prefix)
 
 625         struct commit *rev[MAX_REVS], *commit;
 
 626         char *reflog_msg[MAX_REVS];
 
 627         struct commit_list *list = NULL, *seen = NULL;
 
 628         unsigned int rev_mask[MAX_REVS];
 
 629         int num_rev, i, extra = 0;
 
 630         int all_heads = 0, all_remotes = 0;
 
 631         int all_mask, all_revs;
 
 632         enum rev_sort_order sort_order = REV_SORT_IN_GRAPH_ORDER;
 
 636         unsigned char head_sha1[20];
 
 641         int shown_merge_point = 0;
 
 642         int with_current_branch = 0;
 
 646         const char *reflog_base = NULL;
 
 647         struct option builtin_show_branch_options[] = {
 
 648                 OPT_BOOL('a', "all", &all_heads,
 
 649                          N_("show remote-tracking and local branches")),
 
 650                 OPT_BOOL('r', "remotes", &all_remotes,
 
 651                          N_("show remote-tracking branches")),
 
 652                 OPT__COLOR(&showbranch_use_color,
 
 653                             N_("color '*!+-' corresponding to the branch")),
 
 654                 { OPTION_INTEGER, 0, "more", &extra, N_("n"),
 
 655                             N_("show <n> more commits after the common ancestor"),
 
 656                             PARSE_OPT_OPTARG, NULL, (intptr_t)1 },
 
 657                 OPT_SET_INT(0, "list", &extra, N_("synonym to more=-1"), -1),
 
 658                 OPT_BOOL(0, "no-name", &no_name, N_("suppress naming strings")),
 
 659                 OPT_BOOL(0, "current", &with_current_branch,
 
 660                          N_("include the current branch")),
 
 661                 OPT_BOOL(0, "sha1-name", &sha1_name,
 
 662                          N_("name commits with their object names")),
 
 663                 OPT_BOOL(0, "merge-base", &merge_base,
 
 664                          N_("show possible merge bases")),
 
 665                 OPT_BOOL(0, "independent", &independent,
 
 666                             N_("show refs unreachable from any other ref")),
 
 667                 OPT_SET_INT(0, "topo-order", &sort_order,
 
 668                             N_("show commits in topological order"),
 
 669                             REV_SORT_IN_GRAPH_ORDER),
 
 670                 OPT_BOOL(0, "topics", &topics,
 
 671                          N_("show only commits not on the first branch")),
 
 672                 OPT_SET_INT(0, "sparse", &dense,
 
 673                             N_("show merges reachable from only one tip"), 0),
 
 674                 OPT_SET_INT(0, "date-order", &sort_order,
 
 675                             N_("topologically sort, maintaining date order "
 
 677                             REV_SORT_BY_COMMIT_DATE),
 
 678                 { OPTION_CALLBACK, 'g', "reflog", &reflog_base, N_("<n>[,<base>]"),
 
 679                             N_("show <n> most recent ref-log entries starting at "
 
 681                             PARSE_OPT_OPTARG | PARSE_OPT_LITERAL_ARGHELP,
 
 682                             parse_reflog_param },
 
 686         git_config(git_show_branch_config, NULL);
 
 688         /* If nothing is specified, try the default first */
 
 689         if (ac == 1 && default_num) {
 
 694         ac = parse_options(ac, av, prefix, builtin_show_branch_options,
 
 695                            show_branch_usage, PARSE_OPT_STOP_AT_NON_OPTION);
 
 699         if (extra || reflog) {
 
 700                 /* "listing" mode is incompatible with
 
 701                  * independent nor merge-base modes.
 
 703                 if (independent || merge_base)
 
 704                         usage_with_options(show_branch_usage,
 
 705                                            builtin_show_branch_options);
 
 706                 if (reflog && ((0 < extra) || all_heads || all_remotes))
 
 708                          * Asking for --more in reflog mode does not
 
 709                          * make sense.  --list is Ok.
 
 711                          * Also --all and --remotes do not make sense either.
 
 713                         die("--reflog is incompatible with --all, --remotes, "
 
 714                             "--independent or --merge-base");
 
 717         /* If nothing is specified, show all branches by default */
 
 718         if (ac + all_heads + all_remotes == 0)
 
 722                 unsigned char sha1[20];
 
 728                         static const char *fake_av[2];
 
 730                         fake_av[0] = resolve_refdup("HEAD", sha1, 1, NULL);
 
 736                         die("--reflog option needs one branch name");
 
 738                 if (MAX_REVS < reflog)
 
 739                         die("Only %d entries can be shown at one time.",
 
 741                 if (!dwim_ref(*av, strlen(*av), sha1, &ref))
 
 742                         die("No such ref %s", *av);
 
 744                 /* Has the base been specified? */
 
 747                         base = strtoul(reflog_base, &ep, 10);
 
 749                                 /* Ah, that is a date spec... */
 
 751                                 at = approxidate(reflog_base);
 
 752                                 read_ref_at(ref, at, -1, sha1, NULL,
 
 757                 for (i = 0; i < reflog; i++) {
 
 760                         unsigned long timestamp;
 
 763                         if (read_ref_at(ref, 0, base+i, sha1, &logmsg,
 
 764                                         ×tamp, &tz, NULL)) {
 
 768                         msg = strchr(logmsg, '\t');
 
 773                         m = xmalloc(strlen(msg) + 200);
 
 774                         sprintf(m, "(%s) %s",
 
 775                                 show_date(timestamp, tz, 1),
 
 779                         sprintf(nth_desc, "%s@{%d}", *av, base+i);
 
 780                         append_ref(nth_desc, sha1, 1);
 
 783         else if (all_heads + all_remotes)
 
 784                 snarf_refs(all_heads, all_remotes);
 
 792         head_p = resolve_ref_unsafe("HEAD", head_sha1, 1, NULL);
 
 794                 head_len = strlen(head_p);
 
 795                 memcpy(head, head_p, head_len + 1);
 
 802         if (with_current_branch && head_p) {
 
 804                 for (i = 0; !has_head && i < ref_name_cnt; i++) {
 
 805                         /* We are only interested in adding the branch
 
 808                         if (rev_is_head(head,
 
 815                         int offset = !prefixcmp(head, "refs/heads/") ? 11 : 0;
 
 816                         append_one_rev(head + offset);
 
 821                 fprintf(stderr, "No revs to be shown.\n");
 
 825         for (num_rev = 0; ref_name[num_rev]; num_rev++) {
 
 826                 unsigned char revkey[20];
 
 827                 unsigned int flag = 1u << (num_rev + REV_SHIFT);
 
 829                 if (MAX_REVS <= num_rev)
 
 830                         die("cannot handle more than %d revs.", MAX_REVS);
 
 831                 if (get_sha1(ref_name[num_rev], revkey))
 
 832                         die("'%s' is not a valid ref.", ref_name[num_rev]);
 
 833                 commit = lookup_commit_reference(revkey);
 
 835                         die("cannot find commit %s (%s)",
 
 836                             ref_name[num_rev], revkey);
 
 837                 parse_commit(commit);
 
 838                 mark_seen(commit, &seen);
 
 840                 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
 
 841                  * and so on.  REV_SHIFT bits from bit 0 are used for
 
 842                  * internal bookkeeping.
 
 844                 commit->object.flags |= flag;
 
 845                 if (commit->object.flags == flag)
 
 846                         commit_list_insert_by_date(commit, &list);
 
 847                 rev[num_rev] = commit;
 
 849         for (i = 0; i < num_rev; i++)
 
 850                 rev_mask[i] = rev[i]->object.flags;
 
 853                 join_revs(&list, &seen, num_rev, extra);
 
 855         commit_list_sort_by_date(&seen);
 
 858                 return show_merge_base(seen, num_rev);
 
 861                 return show_independent(rev, num_rev, ref_name, rev_mask);
 
 863         /* Show list; --more=-1 means list-only */
 
 864         if (1 < num_rev || extra < 0) {
 
 865                 for (i = 0; i < num_rev; i++) {
 
 867                         int is_head = rev_is_head(head,
 
 871                                                   rev[i]->object.sha1);
 
 874                                        is_head ? '*' : ' ', ref_name[i]);
 
 876                                 for (j = 0; j < i; j++)
 
 878                                 printf("%s%c%s [%s] ",
 
 881                                        get_color_reset_code(), ref_name[i]);
 
 885                                 /* header lines never need name */
 
 886                                 show_one_commit(rev[i], 1);
 
 895                         for (i = 0; i < num_rev; i++)
 
 903         /* Sort topologically */
 
 904         sort_in_topological_order(&seen, sort_order);
 
 906         /* Give names to commits */
 
 907         if (!sha1_name && !no_name)
 
 908                 name_commits(seen, rev, ref_name, num_rev);
 
 910         all_mask = ((1u << (REV_SHIFT + num_rev)) - 1);
 
 911         all_revs = all_mask & ~((1u << REV_SHIFT) - 1);
 
 914                 struct commit *commit = pop_one_commit(&seen);
 
 915                 int this_flag = commit->object.flags;
 
 916                 int is_merge_point = ((this_flag & all_revs) == all_revs);
 
 918                 shown_merge_point |= is_merge_point;
 
 921                         int is_merge = !!(commit->parents &&
 
 922                                           commit->parents->next);
 
 925                             (this_flag & (1u << REV_SHIFT)))
 
 927                         if (dense && is_merge &&
 
 928                             omit_in_dense(commit, rev, num_rev))
 
 930                         for (i = 0; i < num_rev; i++) {
 
 932                                 if (!(this_flag & (1u << (i + REV_SHIFT))))
 
 936                                 else if (i == head_at)
 
 942                                        mark, get_color_reset_code());
 
 946                 show_one_commit(commit, no_name);
 
 948                 if (shown_merge_point && --extra < 0)