3 #include "environment.h"
12 #include "object-name.h"
13 #include "parse-options.h"
14 #include "repository.h"
16 #include "commit-slab.h"
19 static const char* show_branch_usage
[] = {
20 N_("git show-branch [-a | --all] [-r | --remotes] [--topo-order | --date-order]\n"
21 " [--current] [--color[=<when>] | --no-color] [--sparse]\n"
22 " [--more=<n> | --list | --independent | --merge-base]\n"
23 " [--no-name | --sha1-name] [--topics]\n"
24 " [(<rev> | <glob>)...]"),
25 N_("git show-branch (-g | --reflog)[=<n>[,<base>]] [--list] [<ref>]"),
29 static int showbranch_use_color
= -1;
31 static struct strvec default_args
= STRVEC_INIT
;
34 * TODO: convert this use of commit->object.flags to commit-slab
35 * instead to store a pointer to ref name directly. Then use the same
36 * UNINTERESTING definition from revision.h here.
38 #define UNINTERESTING 01
41 #define MAX_REVS (FLAG_BITS - REV_SHIFT) /* should not exceed bits_per_int - REV_SHIFT */
43 #define DEFAULT_REFLOG 4
45 static const char *get_color_code(int idx
)
47 if (want_color(showbranch_use_color
))
48 return column_colors_ansi
[idx
% column_colors_ansi_max
];
52 static const char *get_color_reset_code(void)
54 if (want_color(showbranch_use_color
))
55 return GIT_COLOR_RESET
;
59 static struct commit
*interesting(struct commit_list
*list
)
62 struct commit
*commit
= list
->item
;
64 if (commit
->object
.flags
& UNINTERESTING
)
72 const char *head_name
; /* which head's ancestor? */
73 int generation
; /* how many parents away from head_name */
76 define_commit_slab(commit_name_slab
, struct commit_name
*);
77 static struct commit_name_slab name_slab
;
79 static struct commit_name
*commit_to_name(struct commit
*commit
)
81 return *commit_name_slab_at(&name_slab
, commit
);
85 /* Name the commit as nth generation ancestor of head_name;
86 * we count only the first-parent relationship for naming purposes.
88 static void name_commit(struct commit
*commit
, const char *head_name
, int nth
)
90 struct commit_name
*name
;
92 name
= *commit_name_slab_at(&name_slab
, commit
);
94 name
= xmalloc(sizeof(*name
));
95 *commit_name_slab_at(&name_slab
, commit
) = name
;
97 name
->head_name
= head_name
;
98 name
->generation
= nth
;
101 /* Parent is the first parent of the commit. We may name it
102 * as (n+1)th generation ancestor of the same head_name as
103 * commit is nth generation ancestor of, if that generation
104 * number is better than the name it already has.
106 static void name_parent(struct commit
*commit
, struct commit
*parent
)
108 struct commit_name
*commit_name
= commit_to_name(commit
);
109 struct commit_name
*parent_name
= commit_to_name(parent
);
113 commit_name
->generation
+ 1 < parent_name
->generation
)
114 name_commit(parent
, commit_name
->head_name
,
115 commit_name
->generation
+ 1);
118 static int name_first_parent_chain(struct commit
*c
)
123 if (!commit_to_name(c
))
127 p
= c
->parents
->item
;
128 if (!commit_to_name(p
)) {
139 static void name_commits(struct commit_list
*list
,
144 struct commit_list
*cl
;
148 /* First give names to the given heads */
149 for (cl
= list
; cl
; cl
= cl
->next
) {
151 if (commit_to_name(c
))
153 for (i
= 0; i
< num_rev
; i
++) {
155 name_commit(c
, ref_name
[i
], 0);
161 /* Then commits on the first parent ancestry chain */
164 for (cl
= list
; cl
; cl
= cl
->next
) {
165 i
+= name_first_parent_chain(cl
->item
);
169 /* Finally, any unnamed commits */
172 for (cl
= list
; cl
; cl
= cl
->next
) {
173 struct commit_list
*parents
;
174 struct commit_name
*n
;
177 if (!commit_to_name(c
))
179 n
= commit_to_name(c
);
180 parents
= c
->parents
;
183 struct commit
*p
= parents
->item
;
184 struct strbuf newname
= STRBUF_INIT
;
185 parents
= parents
->next
;
187 if (commit_to_name(p
))
189 switch (n
->generation
) {
191 strbuf_addstr(&newname
, n
->head_name
);
194 strbuf_addf(&newname
, "%s^", n
->head_name
);
197 strbuf_addf(&newname
, "%s~%d",
198 n
->head_name
, n
->generation
);
202 strbuf_addch(&newname
, '^');
204 strbuf_addf(&newname
, "^%d", nth
);
205 name_commit(p
, strbuf_detach(&newname
, NULL
), 0);
207 name_first_parent_chain(p
);
213 static int mark_seen(struct commit
*commit
, struct commit_list
**seen_p
)
215 if (!commit
->object
.flags
) {
216 commit_list_insert(commit
, seen_p
);
222 static void join_revs(struct commit_list
**list_p
,
223 struct commit_list
**seen_p
,
224 int num_rev
, int extra
)
226 int all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
227 int all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
230 struct commit_list
*parents
;
231 int still_interesting
= !!interesting(*list_p
);
232 struct commit
*commit
= pop_commit(list_p
);
233 int flags
= commit
->object
.flags
& all_mask
;
235 if (!still_interesting
&& extra
<= 0)
238 mark_seen(commit
, seen_p
);
239 if ((flags
& all_revs
) == all_revs
)
240 flags
|= UNINTERESTING
;
241 parents
= commit
->parents
;
244 struct commit
*p
= parents
->item
;
245 int this_flag
= p
->object
.flags
;
246 parents
= parents
->next
;
247 if ((this_flag
& flags
) == flags
)
249 repo_parse_commit(the_repository
, p
);
250 if (mark_seen(p
, seen_p
) && !still_interesting
)
252 p
->object
.flags
|= flags
;
253 commit_list_insert_by_date(p
, list_p
);
258 * Postprocess to complete well-poisoning.
260 * At this point we have all the commits we have seen in
261 * seen_p list. Mark anything that can be reached from
262 * uninteresting commits not interesting.
266 struct commit_list
*s
;
267 for (s
= *seen_p
; s
; s
= s
->next
) {
268 struct commit
*c
= s
->item
;
269 struct commit_list
*parents
;
271 if (((c
->object
.flags
& all_revs
) != all_revs
) &&
272 !(c
->object
.flags
& UNINTERESTING
))
275 /* The current commit is either a merge base or
276 * already uninteresting one. Mark its parents
277 * as uninteresting commits _only_ if they are
278 * already parsed. No reason to find new ones
281 parents
= c
->parents
;
283 struct commit
*p
= parents
->item
;
284 parents
= parents
->next
;
285 if (!(p
->object
.flags
& UNINTERESTING
)) {
286 p
->object
.flags
|= UNINTERESTING
;
296 static void show_one_commit(struct commit
*commit
, int no_name
)
298 struct strbuf pretty
= STRBUF_INIT
;
299 const char *pretty_str
= "(unavailable)";
300 struct commit_name
*name
= commit_to_name(commit
);
302 if (commit
->object
.parsed
) {
303 pp_commit_easy(CMIT_FMT_ONELINE
, commit
, &pretty
);
304 pretty_str
= pretty
.buf
;
306 skip_prefix(pretty_str
, "[PATCH] ", &pretty_str
);
309 if (name
&& name
->head_name
) {
310 printf("[%s", name
->head_name
);
311 if (name
->generation
) {
312 if (name
->generation
== 1)
315 printf("~%d", name
->generation
);
321 repo_find_unique_abbrev(the_repository
, &commit
->object
.oid
,
325 strbuf_release(&pretty
);
328 static char *ref_name
[MAX_REVS
+ 1];
329 static int ref_name_cnt
;
331 static const char *find_digit_prefix(const char *s
, int *v
)
338 '0' <= (ch
= *p
) && ch
<= '9';
340 ver
= ver
* 10 + ch
- '0';
346 static int version_cmp(const char *a
, const char *b
)
351 a
= find_digit_prefix(a
, &va
);
352 b
= find_digit_prefix(b
, &vb
);
359 if ('0' <= ca
&& ca
<= '9')
361 if ('0' <= cb
&& cb
<= '9')
375 static int compare_ref_name(const void *a_
, const void *b_
)
377 const char * const*a
= a_
, * const*b
= b_
;
378 return version_cmp(*a
, *b
);
381 static void sort_ref_range(int bottom
, int top
)
383 QSORT(ref_name
+ bottom
, top
- bottom
, compare_ref_name
);
386 static int append_ref(const char *refname
, const struct object_id
*oid
,
389 struct commit
*commit
= lookup_commit_reference_gently(the_repository
,
397 /* Avoid adding the same thing twice */
398 for (i
= 0; i
< ref_name_cnt
; i
++)
399 if (!strcmp(refname
, ref_name
[i
]))
402 if (MAX_REVS
<= ref_name_cnt
) {
403 warning(Q_("ignoring %s; cannot handle more than %d ref",
404 "ignoring %s; cannot handle more than %d refs",
405 MAX_REVS
), refname
, MAX_REVS
);
408 ref_name
[ref_name_cnt
++] = xstrdup(refname
);
409 ref_name
[ref_name_cnt
] = NULL
;
413 static int append_head_ref(const char *refname
, const struct object_id
*oid
,
414 int flag UNUSED
, void *cb_data UNUSED
)
416 struct object_id tmp
;
418 if (!starts_with(refname
, "refs/heads/"))
420 /* If both heads/foo and tags/foo exists, get_sha1 would
423 if (repo_get_oid(the_repository
, refname
+ ofs
, &tmp
) || !oideq(&tmp
, oid
))
425 return append_ref(refname
+ ofs
, oid
, 0);
428 static int append_remote_ref(const char *refname
, const struct object_id
*oid
,
429 int flag UNUSED
, void *cb_data UNUSED
)
431 struct object_id tmp
;
433 if (!starts_with(refname
, "refs/remotes/"))
435 /* If both heads/foo and tags/foo exists, get_sha1 would
438 if (repo_get_oid(the_repository
, refname
+ ofs
, &tmp
) || !oideq(&tmp
, oid
))
440 return append_ref(refname
+ ofs
, oid
, 0);
443 static int append_tag_ref(const char *refname
, const struct object_id
*oid
,
444 int flag UNUSED
, void *cb_data UNUSED
)
446 if (!starts_with(refname
, "refs/tags/"))
448 return append_ref(refname
+ 5, oid
, 0);
451 static const char *match_ref_pattern
= NULL
;
452 static int match_ref_slash
= 0;
454 static int append_matching_ref(const char *refname
, const struct object_id
*oid
,
455 int flag
, void *cb_data
)
457 /* we want to allow pattern hold/<asterisk> to show all
458 * branches under refs/heads/hold/, and v0.99.9? to show
459 * refs/tags/v0.99.9a and friends.
462 int slash
= count_slashes(refname
);
463 for (tail
= refname
; *tail
&& match_ref_slash
< slash
; )
468 if (wildmatch(match_ref_pattern
, tail
, 0))
470 if (starts_with(refname
, "refs/heads/"))
471 return append_head_ref(refname
, oid
, flag
, cb_data
);
472 if (starts_with(refname
, "refs/tags/"))
473 return append_tag_ref(refname
, oid
, flag
, cb_data
);
474 return append_ref(refname
, oid
, 0);
477 static void snarf_refs(int head
, int remotes
)
480 int orig_cnt
= ref_name_cnt
;
482 for_each_ref(append_head_ref
, NULL
);
483 sort_ref_range(orig_cnt
, ref_name_cnt
);
486 int orig_cnt
= ref_name_cnt
;
488 for_each_ref(append_remote_ref
, NULL
);
489 sort_ref_range(orig_cnt
, ref_name_cnt
);
493 static int rev_is_head(const char *head
, const char *name
)
497 skip_prefix(head
, "refs/heads/", &head
);
498 if (!skip_prefix(name
, "refs/heads/", &name
))
499 skip_prefix(name
, "heads/", &name
);
500 return !strcmp(head
, name
);
503 static int show_merge_base(struct commit_list
*seen
, int num_rev
)
505 int all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
506 int all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
510 struct commit
*commit
= pop_commit(&seen
);
511 int flags
= commit
->object
.flags
& all_mask
;
512 if (!(flags
& UNINTERESTING
) &&
513 ((flags
& all_revs
) == all_revs
)) {
514 puts(oid_to_hex(&commit
->object
.oid
));
516 commit
->object
.flags
|= UNINTERESTING
;
522 static int show_independent(struct commit
**rev
,
524 unsigned int *rev_mask
)
528 for (i
= 0; i
< num_rev
; i
++) {
529 struct commit
*commit
= rev
[i
];
530 unsigned int flag
= rev_mask
[i
];
532 if (commit
->object
.flags
== flag
)
533 puts(oid_to_hex(&commit
->object
.oid
));
534 commit
->object
.flags
|= UNINTERESTING
;
539 static void append_one_rev(const char *av
)
541 struct object_id revkey
;
542 if (!repo_get_oid(the_repository
, av
, &revkey
)) {
543 append_ref(av
, &revkey
, 0);
546 if (strpbrk(av
, "*?[")) {
547 /* glob style match */
548 int saved_matches
= ref_name_cnt
;
550 match_ref_pattern
= av
;
551 match_ref_slash
= count_slashes(av
);
552 for_each_ref(append_matching_ref
, NULL
);
553 if (saved_matches
== ref_name_cnt
&&
554 ref_name_cnt
< MAX_REVS
)
555 error(_("no matching refs with %s"), av
);
556 sort_ref_range(saved_matches
, ref_name_cnt
);
559 die("bad sha1 reference %s", av
);
562 static int git_show_branch_config(const char *var
, const char *value
, void *cb
)
564 if (!strcmp(var
, "showbranch.default")) {
566 return config_error_nonbool(var
);
568 * default_arg is now passed to parse_options(), so we need to
569 * mimic the real argv a bit better.
571 if (!default_args
.nr
)
572 strvec_push(&default_args
, "show-branch");
573 strvec_push(&default_args
, value
);
577 if (!strcmp(var
, "color.showbranch")) {
578 showbranch_use_color
= git_config_colorbool(var
, value
);
582 if (git_color_config(var
, value
, cb
) < 0)
585 return git_default_config(var
, value
, cb
);
588 static int omit_in_dense(struct commit
*commit
, struct commit
**rev
, int n
)
590 /* If the commit is tip of the named branches, do not
592 * Otherwise, if it is a merge that is reachable from only one
593 * tip, it is not that interesting.
596 for (i
= 0; i
< n
; i
++)
597 if (rev
[i
] == commit
)
599 flag
= commit
->object
.flags
;
600 for (i
= count
= 0; i
< n
; i
++) {
601 if (flag
& (1u << (i
+ REV_SHIFT
)))
609 static int reflog
= 0;
611 static int parse_reflog_param(const struct option
*opt
, const char *arg
,
615 const char **base
= (const char **)opt
->value
;
616 BUG_ON_OPT_NEG(unset
);
619 reflog
= strtoul(arg
, &ep
, 10);
623 return error("unrecognized reflog param '%s'", arg
);
627 reflog
= DEFAULT_REFLOG
;
631 int cmd_show_branch(int ac
, const char **av
, const char *prefix
)
633 struct commit
*rev
[MAX_REVS
], *commit
;
634 char *reflog_msg
[MAX_REVS
];
635 struct commit_list
*list
= NULL
, *seen
= NULL
;
636 unsigned int rev_mask
[MAX_REVS
];
637 int num_rev
, i
, extra
= 0;
638 int all_heads
= 0, all_remotes
= 0;
639 int all_mask
, all_revs
;
640 enum rev_sort_order sort_order
= REV_SORT_IN_GRAPH_ORDER
;
642 struct object_id head_oid
;
647 int shown_merge_point
= 0;
648 int with_current_branch
= 0;
652 const char *reflog_base
= NULL
;
653 struct option builtin_show_branch_options
[] = {
654 OPT_BOOL('a', "all", &all_heads
,
655 N_("show remote-tracking and local branches")),
656 OPT_BOOL('r', "remotes", &all_remotes
,
657 N_("show remote-tracking branches")),
658 OPT__COLOR(&showbranch_use_color
,
659 N_("color '*!+-' corresponding to the branch")),
660 { OPTION_INTEGER
, 0, "more", &extra
, N_("n"),
661 N_("show <n> more commits after the common ancestor"),
662 PARSE_OPT_OPTARG
, NULL
, (intptr_t)1 },
663 OPT_SET_INT(0, "list", &extra
, N_("synonym to more=-1"), -1),
664 OPT_BOOL(0, "no-name", &no_name
, N_("suppress naming strings")),
665 OPT_BOOL(0, "current", &with_current_branch
,
666 N_("include the current branch")),
667 OPT_BOOL(0, "sha1-name", &sha1_name
,
668 N_("name commits with their object names")),
669 OPT_BOOL(0, "merge-base", &merge_base
,
670 N_("show possible merge bases")),
671 OPT_BOOL(0, "independent", &independent
,
672 N_("show refs unreachable from any other ref")),
673 OPT_SET_INT(0, "topo-order", &sort_order
,
674 N_("show commits in topological order"),
675 REV_SORT_IN_GRAPH_ORDER
),
676 OPT_BOOL(0, "topics", &topics
,
677 N_("show only commits not on the first branch")),
678 OPT_SET_INT(0, "sparse", &dense
,
679 N_("show merges reachable from only one tip"), 0),
680 OPT_SET_INT(0, "date-order", &sort_order
,
681 N_("topologically sort, maintaining date order "
683 REV_SORT_BY_COMMIT_DATE
),
684 OPT_CALLBACK_F('g', "reflog", &reflog_base
, N_("<n>[,<base>]"),
685 N_("show <n> most recent ref-log entries starting at "
687 PARSE_OPT_OPTARG
| PARSE_OPT_NONEG
,
692 init_commit_name_slab(&name_slab
);
694 git_config(git_show_branch_config
, NULL
);
696 /* If nothing is specified, try the default first */
697 if (ac
== 1 && default_args
.nr
) {
698 ac
= default_args
.nr
;
702 ac
= parse_options(ac
, av
, prefix
, builtin_show_branch_options
,
703 show_branch_usage
, PARSE_OPT_STOP_AT_NON_OPTION
);
707 if (extra
|| reflog
) {
708 /* "listing" mode is incompatible with
709 * independent nor merge-base modes.
711 if (independent
|| merge_base
)
712 usage_with_options(show_branch_usage
,
713 builtin_show_branch_options
);
714 if (reflog
&& ((0 < extra
) || all_heads
|| all_remotes
))
716 * Asking for --more in reflog mode does not
717 * make sense. --list is Ok.
719 * Also --all and --remotes do not make sense either.
721 die(_("options '%s' and '%s' cannot be used together"), "--reflog",
722 "--all/--remotes/--independent/--merge-base");
725 if (with_current_branch
&& reflog
)
726 die(_("options '%s' and '%s' cannot be used together"),
727 "--reflog", "--current");
729 /* If nothing is specified, show all branches by default */
730 if (ac
<= topics
&& all_heads
+ all_remotes
== 0)
734 struct object_id oid
;
737 unsigned int flags
= 0;
740 static const char *fake_av
[2];
742 fake_av
[0] = resolve_refdup("HEAD",
743 RESOLVE_REF_READING
, &oid
,
749 die(_("no branches given, and HEAD is not valid"));
752 die(_("--reflog option needs one branch name"));
754 if (MAX_REVS
< reflog
)
755 die(Q_("only %d entry can be shown at one time.",
756 "only %d entries can be shown at one time.",
757 MAX_REVS
), MAX_REVS
);
758 if (!repo_dwim_ref(the_repository
, *av
, strlen(*av
), &oid
,
760 die(_("no such ref %s"), *av
);
762 /* Has the base been specified? */
765 base
= strtoul(reflog_base
, &ep
, 10);
767 /* Ah, that is a date spec... */
769 at
= approxidate(reflog_base
);
770 read_ref_at(get_main_ref_store(the_repository
),
771 ref
, flags
, at
, -1, &oid
, NULL
,
776 for (i
= 0; i
< reflog
; i
++) {
781 timestamp_t timestamp
;
784 if (read_ref_at(get_main_ref_store(the_repository
),
785 ref
, flags
, 0, base
+ i
, &oid
, &logmsg
,
786 ×tamp
, &tz
, NULL
)) {
791 end
= strchr(logmsg
, '\n');
795 msg
= (*logmsg
== '\0') ? "(none)" : logmsg
;
796 reflog_msg
[i
] = xstrfmt("(%s) %s",
797 show_date(timestamp
, tz
,
798 DATE_MODE(RELATIVE
)),
802 nth_desc
= xstrfmt("%s@{%d}", *av
, base
+i
);
803 append_ref(nth_desc
, &oid
, 1);
813 if (all_heads
+ all_remotes
)
814 snarf_refs(all_heads
, all_remotes
);
817 head
= resolve_refdup("HEAD", RESOLVE_REF_READING
,
820 if (with_current_branch
&& head
) {
822 for (i
= 0; !has_head
&& i
< ref_name_cnt
; i
++) {
823 /* We are only interested in adding the branch
826 if (rev_is_head(head
, ref_name
[i
]))
830 const char *name
= head
;
831 skip_prefix(name
, "refs/heads/", &name
);
832 append_one_rev(name
);
837 fprintf(stderr
, "No revs to be shown.\n");
841 for (num_rev
= 0; ref_name
[num_rev
]; num_rev
++) {
842 struct object_id revkey
;
843 unsigned int flag
= 1u << (num_rev
+ REV_SHIFT
);
845 if (MAX_REVS
<= num_rev
)
846 die(Q_("cannot handle more than %d rev.",
847 "cannot handle more than %d revs.",
848 MAX_REVS
), MAX_REVS
);
849 if (repo_get_oid(the_repository
, ref_name
[num_rev
], &revkey
))
850 die(_("'%s' is not a valid ref."), ref_name
[num_rev
]);
851 commit
= lookup_commit_reference(the_repository
, &revkey
);
853 die(_("cannot find commit %s (%s)"),
854 ref_name
[num_rev
], oid_to_hex(&revkey
));
855 repo_parse_commit(the_repository
, commit
);
856 mark_seen(commit
, &seen
);
858 /* rev#0 uses bit REV_SHIFT, rev#1 uses bit REV_SHIFT+1,
859 * and so on. REV_SHIFT bits from bit 0 are used for
860 * internal bookkeeping.
862 commit
->object
.flags
|= flag
;
863 if (commit
->object
.flags
== flag
)
864 commit_list_insert_by_date(commit
, &list
);
865 rev
[num_rev
] = commit
;
867 for (i
= 0; i
< num_rev
; i
++)
868 rev_mask
[i
] = rev
[i
]->object
.flags
;
871 join_revs(&list
, &seen
, num_rev
, extra
);
873 commit_list_sort_by_date(&seen
);
876 return show_merge_base(seen
, num_rev
);
879 return show_independent(rev
, num_rev
, rev_mask
);
881 /* Show list; --more=-1 means list-only */
882 if (1 < num_rev
|| extra
< 0) {
883 for (i
= 0; i
< num_rev
; i
++) {
885 int is_head
= rev_is_head(head
, ref_name
[i
]) &&
886 oideq(&head_oid
, &rev
[i
]->object
.oid
);
889 is_head
? '*' : ' ', ref_name
[i
]);
891 for (j
= 0; j
< i
; j
++)
893 printf("%s%c%s [%s] ",
896 get_color_reset_code(), ref_name
[i
]);
900 /* header lines never need name */
901 show_one_commit(rev
[i
], 1);
910 for (i
= 0; i
< num_rev
; i
++)
918 /* Sort topologically */
919 sort_in_topological_order(&seen
, sort_order
);
921 /* Give names to commits */
922 if (!sha1_name
&& !no_name
)
923 name_commits(seen
, rev
, ref_name
, num_rev
);
925 all_mask
= ((1u << (REV_SHIFT
+ num_rev
)) - 1);
926 all_revs
= all_mask
& ~((1u << REV_SHIFT
) - 1);
929 struct commit
*commit
= pop_commit(&seen
);
930 int this_flag
= commit
->object
.flags
;
931 int is_merge_point
= ((this_flag
& all_revs
) == all_revs
);
933 shown_merge_point
|= is_merge_point
;
936 int is_merge
= !!(commit
->parents
&&
937 commit
->parents
->next
);
940 (this_flag
& (1u << REV_SHIFT
)))
942 if (dense
&& is_merge
&&
943 omit_in_dense(commit
, rev
, num_rev
))
945 for (i
= 0; i
< num_rev
; i
++) {
947 if (!(this_flag
& (1u << (i
+ REV_SHIFT
))))
951 else if (i
== head_at
)
960 mark
, get_color_reset_code());
964 show_one_commit(commit
, no_name
);
966 if (shown_merge_point
&& --extra
< 0)