11 #include "reflog-walk.h"
12 #include "patch-ids.h"
15 #include "string-list.h"
19 volatile show_early_output_fn_t show_early_output
;
21 char *path_name(const struct name_path
*path
, const char *name
)
23 const struct name_path
*p
;
25 int nlen
= strlen(name
);
28 for (p
= path
; p
; p
= p
->up
) {
30 len
+= p
->elem_len
+ 1;
33 m
= n
+ len
- (nlen
+ 1);
35 for (p
= path
; p
; p
= p
->up
) {
38 memcpy(m
, p
->elem
, p
->elem_len
);
45 static int show_path_component_truncated(FILE *out
, const char *name
, int len
)
48 for (cnt
= 0; cnt
< len
; cnt
++) {
50 if (!ch
|| ch
== '\n')
57 static int show_path_truncated(FILE *out
, const struct name_path
*path
)
63 emitted
= show_path_truncated(out
, path
->up
);
68 ours
= show_path_component_truncated(out
, path
->elem
, path
->elem_len
);
71 return ours
|| emitted
;
74 void show_object_with_name(FILE *out
, struct object
*obj
,
75 const struct name_path
*path
, const char *component
)
77 struct name_path leaf
;
78 leaf
.up
= (struct name_path
*)path
;
79 leaf
.elem
= component
;
80 leaf
.elem_len
= strlen(component
);
82 fprintf(out
, "%s ", sha1_to_hex(obj
->sha1
));
83 show_path_truncated(out
, &leaf
);
87 void add_object(struct object
*obj
,
88 struct object_array
*p
,
89 struct name_path
*path
,
92 char *pn
= path_name(path
, name
);
93 add_object_array(obj
, pn
, p
);
97 static void mark_blob_uninteresting(struct blob
*blob
)
101 if (blob
->object
.flags
& UNINTERESTING
)
103 blob
->object
.flags
|= UNINTERESTING
;
106 void mark_tree_uninteresting(struct tree
*tree
)
108 struct tree_desc desc
;
109 struct name_entry entry
;
110 struct object
*obj
= &tree
->object
;
114 if (obj
->flags
& UNINTERESTING
)
116 obj
->flags
|= UNINTERESTING
;
117 if (!has_sha1_file(obj
->sha1
))
119 if (parse_tree(tree
) < 0)
120 die("bad tree %s", sha1_to_hex(obj
->sha1
));
122 init_tree_desc(&desc
, tree
->buffer
, tree
->size
);
123 while (tree_entry(&desc
, &entry
)) {
124 switch (object_type(entry
.mode
)) {
126 mark_tree_uninteresting(lookup_tree(entry
.sha1
));
129 mark_blob_uninteresting(lookup_blob(entry
.sha1
));
132 /* Subproject commit - not in this repository */
138 * We don't care about the tree any more
139 * after it has been marked uninteresting.
145 void mark_parents_uninteresting(struct commit
*commit
)
147 struct commit_list
*parents
= NULL
, *l
;
149 for (l
= commit
->parents
; l
; l
= l
->next
)
150 commit_list_insert(l
->item
, &parents
);
153 struct commit
*commit
= parents
->item
;
155 parents
= parents
->next
;
160 * A missing commit is ok iff its parent is marked
163 * We just mark such a thing parsed, so that when
164 * it is popped next time around, we won't be trying
165 * to parse it and get an error.
167 if (!has_sha1_file(commit
->object
.sha1
))
168 commit
->object
.parsed
= 1;
170 if (commit
->object
.flags
& UNINTERESTING
)
173 commit
->object
.flags
|= UNINTERESTING
;
176 * Normally we haven't parsed the parent
177 * yet, so we won't have a parent of a parent
178 * here. However, it may turn out that we've
179 * reached this commit some other way (where it
180 * wasn't uninteresting), in which case we need
181 * to mark its parents recursively too..
183 if (!commit
->parents
)
186 for (l
= commit
->parents
->next
; l
; l
= l
->next
)
187 commit_list_insert(l
->item
, &parents
);
188 commit
= commit
->parents
->item
;
193 static void add_pending_object_with_mode(struct rev_info
*revs
,
195 const char *name
, unsigned mode
)
199 if (revs
->no_walk
&& (obj
->flags
& UNINTERESTING
))
201 if (revs
->reflog_info
&& obj
->type
== OBJ_COMMIT
) {
202 struct strbuf buf
= STRBUF_INIT
;
203 int len
= interpret_branch_name(name
, &buf
);
206 if (0 < len
&& name
[len
] && buf
.len
)
207 strbuf_addstr(&buf
, name
+ len
);
208 st
= add_reflog_for_walk(revs
->reflog_info
,
209 (struct commit
*)obj
,
210 buf
.buf
[0] ? buf
.buf
: name
);
211 strbuf_release(&buf
);
215 add_object_array_with_mode(obj
, name
, &revs
->pending
, mode
);
218 void add_pending_object(struct rev_info
*revs
,
219 struct object
*obj
, const char *name
)
221 add_pending_object_with_mode(revs
, obj
, name
, S_IFINVALID
);
224 void add_head_to_pending(struct rev_info
*revs
)
226 unsigned char sha1
[20];
228 if (get_sha1("HEAD", sha1
))
230 obj
= parse_object(sha1
);
233 add_pending_object(revs
, obj
, "HEAD");
236 static struct object
*get_reference(struct rev_info
*revs
, const char *name
,
237 const unsigned char *sha1
,
240 struct object
*object
;
242 object
= parse_object(sha1
);
244 if (revs
->ignore_missing
)
246 die("bad object %s", name
);
248 object
->flags
|= flags
;
252 void add_pending_sha1(struct rev_info
*revs
, const char *name
,
253 const unsigned char *sha1
, unsigned int flags
)
255 struct object
*object
= get_reference(revs
, name
, sha1
, flags
);
256 add_pending_object(revs
, object
, name
);
259 static struct commit
*handle_commit(struct rev_info
*revs
,
260 struct object
*object
, const char *name
)
262 unsigned long flags
= object
->flags
;
265 * Tag object? Look what it points to..
267 while (object
->type
== OBJ_TAG
) {
268 struct tag
*tag
= (struct tag
*) object
;
269 if (revs
->tag_objects
&& !(flags
& UNINTERESTING
))
270 add_pending_object(revs
, object
, tag
->tag
);
273 object
= parse_object(tag
->tagged
->sha1
);
275 if (flags
& UNINTERESTING
)
277 die("bad object %s", sha1_to_hex(tag
->tagged
->sha1
));
282 * Commit object? Just return it, we'll do all the complex
285 if (object
->type
== OBJ_COMMIT
) {
286 struct commit
*commit
= (struct commit
*)object
;
287 if (parse_commit(commit
) < 0)
288 die("unable to parse commit %s", name
);
289 if (flags
& UNINTERESTING
) {
290 commit
->object
.flags
|= UNINTERESTING
;
291 mark_parents_uninteresting(commit
);
294 if (revs
->show_source
&& !commit
->util
)
295 commit
->util
= (void *) name
;
300 * Tree object? Either mark it uninteresting, or add it
301 * to the list of objects to look at later..
303 if (object
->type
== OBJ_TREE
) {
304 struct tree
*tree
= (struct tree
*)object
;
305 if (!revs
->tree_objects
)
307 if (flags
& UNINTERESTING
) {
308 mark_tree_uninteresting(tree
);
311 add_pending_object(revs
, object
, "");
316 * Blob object? You know the drill by now..
318 if (object
->type
== OBJ_BLOB
) {
319 struct blob
*blob
= (struct blob
*)object
;
320 if (!revs
->blob_objects
)
322 if (flags
& UNINTERESTING
) {
323 mark_blob_uninteresting(blob
);
326 add_pending_object(revs
, object
, "");
329 die("%s is unknown object", name
);
332 static int everybody_uninteresting(struct commit_list
*orig
)
334 struct commit_list
*list
= orig
;
336 struct commit
*commit
= list
->item
;
338 if (commit
->object
.flags
& UNINTERESTING
)
346 * A definition of "relevant" commit that we can use to simplify limited graphs
347 * by eliminating side branches.
349 * A "relevant" commit is one that is !UNINTERESTING (ie we are including it
350 * in our list), or that is a specified BOTTOM commit. Then after computing
351 * a limited list, during processing we can generally ignore boundary merges
352 * coming from outside the graph, (ie from irrelevant parents), and treat
353 * those merges as if they were single-parent. TREESAME is defined to consider
354 * only relevant parents, if any. If we are TREESAME to our on-graph parents,
355 * we don't care if we were !TREESAME to non-graph parents.
357 * Treating bottom commits as relevant ensures that a limited graph's
358 * connection to the actual bottom commit is not viewed as a side branch, but
359 * treated as part of the graph. For example:
361 * ....Z...A---X---o---o---B
365 * When computing "A..B", the A-X connection is at least as important as
366 * Y-X, despite A being flagged UNINTERESTING.
368 * And when computing --ancestry-path "A..B", the A-X connection is more
369 * important than Y-X, despite both A and Y being flagged UNINTERESTING.
371 static inline int relevant_commit(struct commit
*commit
)
373 return (commit
->object
.flags
& (UNINTERESTING
| BOTTOM
)) != UNINTERESTING
;
377 * Return a single relevant commit from a parent list. If we are a TREESAME
378 * commit, and this selects one of our parents, then we can safely simplify to
381 static struct commit
*one_relevant_parent(const struct rev_info
*revs
,
382 struct commit_list
*orig
)
384 struct commit_list
*list
= orig
;
385 struct commit
*relevant
= NULL
;
391 * For 1-parent commits, or if first-parent-only, then return that
392 * first parent (even if not "relevant" by the above definition).
393 * TREESAME will have been set purely on that parent.
395 if (revs
->first_parent_only
|| !orig
->next
)
399 * For multi-parent commits, identify a sole relevant parent, if any.
400 * If we have only one relevant parent, then TREESAME will be set purely
401 * with regard to that parent, and we can simplify accordingly.
403 * If we have more than one relevant parent, or no relevant parents
404 * (and multiple irrelevant ones), then we can't select a parent here
408 struct commit
*commit
= list
->item
;
410 if (relevant_commit(commit
)) {
420 * The goal is to get REV_TREE_NEW as the result only if the
421 * diff consists of all '+' (and no other changes), REV_TREE_OLD
422 * if the whole diff is removal of old data, and otherwise
423 * REV_TREE_DIFFERENT (of course if the trees are the same we
424 * want REV_TREE_SAME).
425 * That means that once we get to REV_TREE_DIFFERENT, we do not
426 * have to look any further.
428 static int tree_difference
= REV_TREE_SAME
;
430 static void file_add_remove(struct diff_options
*options
,
431 int addremove
, unsigned mode
,
432 const unsigned char *sha1
,
434 const char *fullpath
, unsigned dirty_submodule
)
436 int diff
= addremove
== '+' ? REV_TREE_NEW
: REV_TREE_OLD
;
438 tree_difference
|= diff
;
439 if (tree_difference
== REV_TREE_DIFFERENT
)
440 DIFF_OPT_SET(options
, HAS_CHANGES
);
443 static void file_change(struct diff_options
*options
,
444 unsigned old_mode
, unsigned new_mode
,
445 const unsigned char *old_sha1
,
446 const unsigned char *new_sha1
,
447 int old_sha1_valid
, int new_sha1_valid
,
448 const char *fullpath
,
449 unsigned old_dirty_submodule
, unsigned new_dirty_submodule
)
451 tree_difference
= REV_TREE_DIFFERENT
;
452 DIFF_OPT_SET(options
, HAS_CHANGES
);
455 static int rev_compare_tree(struct rev_info
*revs
,
456 struct commit
*parent
, struct commit
*commit
)
458 struct tree
*t1
= parent
->tree
;
459 struct tree
*t2
= commit
->tree
;
466 if (revs
->simplify_by_decoration
) {
468 * If we are simplifying by decoration, then the commit
469 * is worth showing if it has a tag pointing at it.
471 if (lookup_decoration(&name_decoration
, &commit
->object
))
472 return REV_TREE_DIFFERENT
;
474 * A commit that is not pointed by a tag is uninteresting
475 * if we are not limited by path. This means that you will
476 * see the usual "commits that touch the paths" plus any
477 * tagged commit by specifying both --simplify-by-decoration
480 if (!revs
->prune_data
.nr
)
481 return REV_TREE_SAME
;
484 tree_difference
= REV_TREE_SAME
;
485 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
486 if (diff_tree_sha1(t1
->object
.sha1
, t2
->object
.sha1
, "",
488 return REV_TREE_DIFFERENT
;
489 return tree_difference
;
492 static int rev_same_tree_as_empty(struct rev_info
*revs
, struct commit
*commit
)
497 struct tree_desc empty
, real
;
498 struct tree
*t1
= commit
->tree
;
503 tree
= read_object_with_reference(t1
->object
.sha1
, tree_type
, &size
, NULL
);
506 init_tree_desc(&real
, tree
, size
);
507 init_tree_desc(&empty
, "", 0);
509 tree_difference
= REV_TREE_SAME
;
510 DIFF_OPT_CLR(&revs
->pruning
, HAS_CHANGES
);
511 retval
= diff_tree(&empty
, &real
, "", &revs
->pruning
);
514 return retval
>= 0 && (tree_difference
== REV_TREE_SAME
);
517 struct treesame_state
{
518 unsigned int nparents
;
519 unsigned char treesame
[FLEX_ARRAY
];
522 static struct treesame_state
*initialise_treesame(struct rev_info
*revs
, struct commit
*commit
)
524 unsigned n
= commit_list_count(commit
->parents
);
525 struct treesame_state
*st
= xcalloc(1, sizeof(*st
) + n
);
527 add_decoration(&revs
->treesame
, &commit
->object
, st
);
532 * Must be called immediately after removing the nth_parent from a commit's
533 * parent list, if we are maintaining the per-parent treesame[] decoration.
534 * This does not recalculate the master TREESAME flag - update_treesame()
535 * should be called to update it after a sequence of treesame[] modifications
536 * that may have affected it.
538 static int compact_treesame(struct rev_info
*revs
, struct commit
*commit
, unsigned nth_parent
)
540 struct treesame_state
*st
;
543 if (!commit
->parents
) {
545 * Have just removed the only parent from a non-merge.
546 * Different handling, as we lack decoration.
549 die("compact_treesame %u", nth_parent
);
550 old_same
= !!(commit
->object
.flags
& TREESAME
);
551 if (rev_same_tree_as_empty(revs
, commit
))
552 commit
->object
.flags
|= TREESAME
;
554 commit
->object
.flags
&= ~TREESAME
;
558 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
559 if (!st
|| nth_parent
>= st
->nparents
)
560 die("compact_treesame %u", nth_parent
);
562 old_same
= st
->treesame
[nth_parent
];
563 memmove(st
->treesame
+ nth_parent
,
564 st
->treesame
+ nth_parent
+ 1,
565 st
->nparents
- nth_parent
- 1);
568 * If we've just become a non-merge commit, update TREESAME
569 * immediately, and remove the no-longer-needed decoration.
570 * If still a merge, defer update until update_treesame().
572 if (--st
->nparents
== 1) {
573 if (commit
->parents
->next
)
574 die("compact_treesame parents mismatch");
575 if (st
->treesame
[0] && revs
->dense
)
576 commit
->object
.flags
|= TREESAME
;
578 commit
->object
.flags
&= ~TREESAME
;
579 free(add_decoration(&revs
->treesame
, &commit
->object
, NULL
));
585 static unsigned update_treesame(struct rev_info
*revs
, struct commit
*commit
)
587 if (commit
->parents
&& commit
->parents
->next
) {
589 struct treesame_state
*st
;
590 struct commit_list
*p
;
591 unsigned relevant_parents
;
592 unsigned relevant_change
, irrelevant_change
;
594 st
= lookup_decoration(&revs
->treesame
, &commit
->object
);
596 die("update_treesame %s", sha1_to_hex(commit
->object
.sha1
));
597 relevant_parents
= 0;
598 relevant_change
= irrelevant_change
= 0;
599 for (p
= commit
->parents
, n
= 0; p
; n
++, p
= p
->next
) {
600 if (relevant_commit(p
->item
)) {
601 relevant_change
|= !st
->treesame
[n
];
604 irrelevant_change
|= !st
->treesame
[n
];
606 if (relevant_parents
? relevant_change
: irrelevant_change
)
607 commit
->object
.flags
&= ~TREESAME
;
609 commit
->object
.flags
|= TREESAME
;
612 return commit
->object
.flags
& TREESAME
;
615 static inline int limiting_can_increase_treesame(const struct rev_info
*revs
)
618 * TREESAME is irrelevant unless prune && dense;
619 * if simplify_history is set, we can't have a mixture of TREESAME and
620 * !TREESAME INTERESTING parents (and we don't have treesame[]
621 * decoration anyway);
622 * if first_parent_only is set, then the TREESAME flag is locked
623 * against the first parent (and again we lack treesame[] decoration).
625 return revs
->prune
&& revs
->dense
&&
626 !revs
->simplify_history
&&
627 !revs
->first_parent_only
;
630 static void try_to_simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
632 struct commit_list
**pp
, *parent
;
633 struct treesame_state
*ts
= NULL
;
634 int relevant_change
= 0, irrelevant_change
= 0;
635 int relevant_parents
, nth_parent
;
638 * If we don't do pruning, everything is interesting
646 if (!commit
->parents
) {
647 if (rev_same_tree_as_empty(revs
, commit
))
648 commit
->object
.flags
|= TREESAME
;
653 * Normal non-merge commit? If we don't want to make the
654 * history dense, we consider it always to be a change..
656 if (!revs
->dense
&& !commit
->parents
->next
)
659 for (pp
= &commit
->parents
, nth_parent
= 0, relevant_parents
= 0;
660 (parent
= *pp
) != NULL
;
661 pp
= &parent
->next
, nth_parent
++) {
662 struct commit
*p
= parent
->item
;
663 if (relevant_commit(p
))
666 if (nth_parent
== 1) {
668 * This our second loop iteration - so we now know
669 * we're dealing with a merge.
671 * Do not compare with later parents when we care only about
672 * the first parent chain, in order to avoid derailing the
673 * traversal to follow a side branch that brought everything
674 * in the path we are limited to by the pathspec.
676 if (revs
->first_parent_only
)
679 * If this will remain a potentially-simplifiable
680 * merge, remember per-parent treesame if needed.
681 * Initialise the array with the comparison from our
684 if (revs
->treesame
.name
&&
685 !revs
->simplify_history
&&
686 !(commit
->object
.flags
& UNINTERESTING
)) {
687 ts
= initialise_treesame(revs
, commit
);
688 if (!(irrelevant_change
|| relevant_change
))
692 if (parse_commit(p
) < 0)
693 die("cannot simplify commit %s (because of %s)",
694 sha1_to_hex(commit
->object
.sha1
),
695 sha1_to_hex(p
->object
.sha1
));
696 switch (rev_compare_tree(revs
, p
, commit
)) {
698 if (!revs
->simplify_history
|| !relevant_commit(p
)) {
699 /* Even if a merge with an uninteresting
700 * side branch brought the entire change
701 * we are interested in, we do not want
702 * to lose the other branches of this
703 * merge, so we just keep going.
706 ts
->treesame
[nth_parent
] = 1;
710 commit
->parents
= parent
;
711 commit
->object
.flags
|= TREESAME
;
715 if (revs
->remove_empty_trees
&&
716 rev_same_tree_as_empty(revs
, p
)) {
717 /* We are adding all the specified
718 * paths from this parent, so the
719 * history beyond this parent is not
720 * interesting. Remove its parents
721 * (they are grandparents for us).
722 * IOW, we pretend this parent is a
725 if (parse_commit(p
) < 0)
726 die("cannot simplify commit %s (invalid %s)",
727 sha1_to_hex(commit
->object
.sha1
),
728 sha1_to_hex(p
->object
.sha1
));
733 case REV_TREE_DIFFERENT
:
734 if (relevant_commit(p
))
737 irrelevant_change
= 1;
740 die("bad tree compare for commit %s", sha1_to_hex(commit
->object
.sha1
));
744 * TREESAME is straightforward for single-parent commits. For merge
745 * commits, it is most useful to define it so that "irrelevant"
746 * parents cannot make us !TREESAME - if we have any relevant
747 * parents, then we only consider TREESAMEness with respect to them,
748 * allowing irrelevant merges from uninteresting branches to be
749 * simplified away. Only if we have only irrelevant parents do we
750 * base TREESAME on them. Note that this logic is replicated in
751 * update_treesame, which should be kept in sync.
753 if (relevant_parents
? !relevant_change
: !irrelevant_change
)
754 commit
->object
.flags
|= TREESAME
;
757 static void commit_list_insert_by_date_cached(struct commit
*p
, struct commit_list
**head
,
758 struct commit_list
*cached_base
, struct commit_list
**cache
)
760 struct commit_list
*new_entry
;
762 if (cached_base
&& p
->date
< cached_base
->item
->date
)
763 new_entry
= commit_list_insert_by_date(p
, &cached_base
->next
);
765 new_entry
= commit_list_insert_by_date(p
, head
);
767 if (cache
&& (!*cache
|| p
->date
< (*cache
)->item
->date
))
771 static int add_parents_to_list(struct rev_info
*revs
, struct commit
*commit
,
772 struct commit_list
**list
, struct commit_list
**cache_ptr
)
774 struct commit_list
*parent
= commit
->parents
;
776 struct commit_list
*cached_base
= cache_ptr
? *cache_ptr
: NULL
;
778 if (commit
->object
.flags
& ADDED
)
780 commit
->object
.flags
|= ADDED
;
783 * If the commit is uninteresting, don't try to
784 * prune parents - we want the maximal uninteresting
787 * Normally we haven't parsed the parent
788 * yet, so we won't have a parent of a parent
789 * here. However, it may turn out that we've
790 * reached this commit some other way (where it
791 * wasn't uninteresting), in which case we need
792 * to mark its parents recursively too..
794 if (commit
->object
.flags
& UNINTERESTING
) {
796 struct commit
*p
= parent
->item
;
797 parent
= parent
->next
;
799 p
->object
.flags
|= UNINTERESTING
;
800 if (parse_commit(p
) < 0)
803 mark_parents_uninteresting(p
);
804 if (p
->object
.flags
& SEEN
)
806 p
->object
.flags
|= SEEN
;
807 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
813 * Ok, the commit wasn't uninteresting. Try to
814 * simplify the commit history and find the parent
815 * that has no differences in the path set if one exists.
817 try_to_simplify_commit(revs
, commit
);
822 left_flag
= (commit
->object
.flags
& SYMMETRIC_LEFT
);
824 for (parent
= commit
->parents
; parent
; parent
= parent
->next
) {
825 struct commit
*p
= parent
->item
;
827 if (parse_commit(p
) < 0)
829 if (revs
->show_source
&& !p
->util
)
830 p
->util
= commit
->util
;
831 p
->object
.flags
|= left_flag
;
832 if (!(p
->object
.flags
& SEEN
)) {
833 p
->object
.flags
|= SEEN
;
834 commit_list_insert_by_date_cached(p
, list
, cached_base
, cache_ptr
);
836 if (revs
->first_parent_only
)
842 static void cherry_pick_list(struct commit_list
*list
, struct rev_info
*revs
)
844 struct commit_list
*p
;
845 int left_count
= 0, right_count
= 0;
847 struct patch_ids ids
;
848 unsigned cherry_flag
;
850 /* First count the commits on the left and on the right */
851 for (p
= list
; p
; p
= p
->next
) {
852 struct commit
*commit
= p
->item
;
853 unsigned flags
= commit
->object
.flags
;
854 if (flags
& BOUNDARY
)
856 else if (flags
& SYMMETRIC_LEFT
)
862 if (!left_count
|| !right_count
)
865 left_first
= left_count
< right_count
;
866 init_patch_ids(&ids
);
867 ids
.diffopts
.pathspec
= revs
->diffopt
.pathspec
;
869 /* Compute patch-ids for one side */
870 for (p
= list
; p
; p
= p
->next
) {
871 struct commit
*commit
= p
->item
;
872 unsigned flags
= commit
->object
.flags
;
874 if (flags
& BOUNDARY
)
877 * If we have fewer left, left_first is set and we omit
878 * commits on the right branch in this loop. If we have
879 * fewer right, we skip the left ones.
881 if (left_first
!= !!(flags
& SYMMETRIC_LEFT
))
883 commit
->util
= add_commit_patch_id(commit
, &ids
);
886 /* either cherry_mark or cherry_pick are true */
887 cherry_flag
= revs
->cherry_mark
? PATCHSAME
: SHOWN
;
889 /* Check the other side */
890 for (p
= list
; p
; p
= p
->next
) {
891 struct commit
*commit
= p
->item
;
893 unsigned flags
= commit
->object
.flags
;
895 if (flags
& BOUNDARY
)
898 * If we have fewer left, left_first is set and we omit
899 * commits on the left branch in this loop.
901 if (left_first
== !!(flags
& SYMMETRIC_LEFT
))
905 * Have we seen the same patch id?
907 id
= has_commit_patch_id(commit
, &ids
);
911 commit
->object
.flags
|= cherry_flag
;
914 /* Now check the original side for seen ones */
915 for (p
= list
; p
; p
= p
->next
) {
916 struct commit
*commit
= p
->item
;
917 struct patch_id
*ent
;
923 commit
->object
.flags
|= cherry_flag
;
927 free_patch_ids(&ids
);
930 /* How many extra uninteresting commits we want to see.. */
933 static int still_interesting(struct commit_list
*src
, unsigned long date
, int slop
)
936 * No source list at all? We're definitely done..
942 * Does the destination list contain entries with a date
943 * before the source list? Definitely _not_ done.
945 if (date
<= src
->item
->date
)
949 * Does the source list still have interesting commits in
950 * it? Definitely not done..
952 if (!everybody_uninteresting(src
))
955 /* Ok, we're closing in.. */
960 * "rev-list --ancestry-path A..B" computes commits that are ancestors
961 * of B but not ancestors of A but further limits the result to those
962 * that are descendants of A. This takes the list of bottom commits and
963 * the result of "A..B" without --ancestry-path, and limits the latter
964 * further to the ones that can reach one of the commits in "bottom".
966 static void limit_to_ancestry(struct commit_list
*bottom
, struct commit_list
*list
)
968 struct commit_list
*p
;
969 struct commit_list
*rlist
= NULL
;
973 * Reverse the list so that it will be likely that we would
974 * process parents before children.
976 for (p
= list
; p
; p
= p
->next
)
977 commit_list_insert(p
->item
, &rlist
);
979 for (p
= bottom
; p
; p
= p
->next
)
980 p
->item
->object
.flags
|= TMP_MARK
;
983 * Mark the ones that can reach bottom commits in "list",
984 * in a bottom-up fashion.
988 for (p
= rlist
; p
; p
= p
->next
) {
989 struct commit
*c
= p
->item
;
990 struct commit_list
*parents
;
991 if (c
->object
.flags
& (TMP_MARK
| UNINTERESTING
))
993 for (parents
= c
->parents
;
995 parents
= parents
->next
) {
996 if (!(parents
->item
->object
.flags
& TMP_MARK
))
998 c
->object
.flags
|= TMP_MARK
;
1003 } while (made_progress
);
1006 * NEEDSWORK: decide if we want to remove parents that are
1007 * not marked with TMP_MARK from commit->parents for commits
1008 * in the resulting list. We may not want to do that, though.
1012 * The ones that are not marked with TMP_MARK are uninteresting
1014 for (p
= list
; p
; p
= p
->next
) {
1015 struct commit
*c
= p
->item
;
1016 if (c
->object
.flags
& TMP_MARK
)
1018 c
->object
.flags
|= UNINTERESTING
;
1021 /* We are done with the TMP_MARK */
1022 for (p
= list
; p
; p
= p
->next
)
1023 p
->item
->object
.flags
&= ~TMP_MARK
;
1024 for (p
= bottom
; p
; p
= p
->next
)
1025 p
->item
->object
.flags
&= ~TMP_MARK
;
1026 free_commit_list(rlist
);
1030 * Before walking the history, keep the set of "negative" refs the
1031 * caller has asked to exclude.
1033 * This is used to compute "rev-list --ancestry-path A..B", as we need
1034 * to filter the result of "A..B" further to the ones that can actually
1037 static struct commit_list
*collect_bottom_commits(struct commit_list
*list
)
1039 struct commit_list
*elem
, *bottom
= NULL
;
1040 for (elem
= list
; elem
; elem
= elem
->next
)
1041 if (elem
->item
->object
.flags
& BOTTOM
)
1042 commit_list_insert(elem
->item
, &bottom
);
1046 /* Assumes either left_only or right_only is set */
1047 static void limit_left_right(struct commit_list
*list
, struct rev_info
*revs
)
1049 struct commit_list
*p
;
1051 for (p
= list
; p
; p
= p
->next
) {
1052 struct commit
*commit
= p
->item
;
1054 if (revs
->right_only
) {
1055 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
1056 commit
->object
.flags
|= SHOWN
;
1057 } else /* revs->left_only is set */
1058 if (!(commit
->object
.flags
& SYMMETRIC_LEFT
))
1059 commit
->object
.flags
|= SHOWN
;
1063 static int limit_list(struct rev_info
*revs
)
1066 unsigned long date
= ~0ul;
1067 struct commit_list
*list
= revs
->commits
;
1068 struct commit_list
*newlist
= NULL
;
1069 struct commit_list
**p
= &newlist
;
1070 struct commit_list
*bottom
= NULL
;
1072 if (revs
->ancestry_path
) {
1073 bottom
= collect_bottom_commits(list
);
1075 die("--ancestry-path given but there are no bottom commits");
1079 struct commit_list
*entry
= list
;
1080 struct commit
*commit
= list
->item
;
1081 struct object
*obj
= &commit
->object
;
1082 show_early_output_fn_t show
;
1087 if (revs
->max_age
!= -1 && (commit
->date
< revs
->max_age
))
1088 obj
->flags
|= UNINTERESTING
;
1089 if (add_parents_to_list(revs
, commit
, &list
, NULL
) < 0)
1091 if (obj
->flags
& UNINTERESTING
) {
1092 mark_parents_uninteresting(commit
);
1094 p
= &commit_list_insert(commit
, p
)->next
;
1095 slop
= still_interesting(list
, date
, slop
);
1098 /* If showing all, add the whole pending list to the end */
1103 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
1105 date
= commit
->date
;
1106 p
= &commit_list_insert(commit
, p
)->next
;
1108 show
= show_early_output
;
1112 show(revs
, newlist
);
1113 show_early_output
= NULL
;
1115 if (revs
->cherry_pick
|| revs
->cherry_mark
)
1116 cherry_pick_list(newlist
, revs
);
1118 if (revs
->left_only
|| revs
->right_only
)
1119 limit_left_right(newlist
, revs
);
1122 limit_to_ancestry(bottom
, newlist
);
1123 free_commit_list(bottom
);
1127 * Check if any commits have become TREESAME by some of their parents
1128 * becoming UNINTERESTING.
1130 if (limiting_can_increase_treesame(revs
))
1131 for (list
= newlist
; list
; list
= list
->next
) {
1132 struct commit
*c
= list
->item
;
1133 if (c
->object
.flags
& (UNINTERESTING
| TREESAME
))
1135 update_treesame(revs
, c
);
1138 revs
->commits
= newlist
;
1143 * Add an entry to refs->cmdline with the specified information.
1146 static void add_rev_cmdline(struct rev_info
*revs
,
1147 struct object
*item
,
1152 struct rev_cmdline_info
*info
= &revs
->cmdline
;
1155 ALLOC_GROW(info
->rev
, nr
+ 1, info
->alloc
);
1156 info
->rev
[nr
].item
= item
;
1157 info
->rev
[nr
].name
= xstrdup(name
);
1158 info
->rev
[nr
].whence
= whence
;
1159 info
->rev
[nr
].flags
= flags
;
1163 static void add_rev_cmdline_list(struct rev_info
*revs
,
1164 struct commit_list
*commit_list
,
1168 while (commit_list
) {
1169 struct object
*object
= &commit_list
->item
->object
;
1170 add_rev_cmdline(revs
, object
, sha1_to_hex(object
->sha1
),
1172 commit_list
= commit_list
->next
;
1176 struct all_refs_cb
{
1178 int warned_bad_reflog
;
1179 struct rev_info
*all_revs
;
1180 const char *name_for_errormsg
;
1183 static int ref_excluded(struct rev_info
*revs
, const char *path
)
1185 struct string_list_item
*item
;
1187 if (!revs
->ref_excludes
)
1189 for_each_string_list_item(item
, revs
->ref_excludes
) {
1190 if (!fnmatch(item
->string
, path
, 0))
1196 static int handle_one_ref(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1198 struct all_refs_cb
*cb
= cb_data
;
1199 struct object
*object
;
1201 if (ref_excluded(cb
->all_revs
, path
))
1204 object
= get_reference(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1205 add_rev_cmdline(cb
->all_revs
, object
, path
, REV_CMD_REF
, cb
->all_flags
);
1206 add_pending_sha1(cb
->all_revs
, path
, sha1
, cb
->all_flags
);
1210 static void init_all_refs_cb(struct all_refs_cb
*cb
, struct rev_info
*revs
,
1213 cb
->all_revs
= revs
;
1214 cb
->all_flags
= flags
;
1217 static void clear_ref_exclusion(struct rev_info
*revs
)
1219 if (revs
->ref_excludes
) {
1220 string_list_clear(revs
->ref_excludes
, 0);
1221 free(revs
->ref_excludes
);
1223 revs
->ref_excludes
= NULL
;
1226 static void add_ref_exclusion(struct rev_info
*revs
, const char *exclude
)
1228 if (!revs
->ref_excludes
) {
1229 revs
->ref_excludes
= xcalloc(1, sizeof(*revs
->ref_excludes
));
1230 revs
->ref_excludes
->strdup_strings
= 1;
1232 string_list_append(revs
->ref_excludes
, exclude
);
1235 static void handle_refs(const char *submodule
, struct rev_info
*revs
, unsigned flags
,
1236 int (*for_each
)(const char *, each_ref_fn
, void *))
1238 struct all_refs_cb cb
;
1239 init_all_refs_cb(&cb
, revs
, flags
);
1240 for_each(submodule
, handle_one_ref
, &cb
);
1243 static void handle_one_reflog_commit(unsigned char *sha1
, void *cb_data
)
1245 struct all_refs_cb
*cb
= cb_data
;
1246 if (!is_null_sha1(sha1
)) {
1247 struct object
*o
= parse_object(sha1
);
1249 o
->flags
|= cb
->all_flags
;
1250 /* ??? CMDLINEFLAGS ??? */
1251 add_pending_object(cb
->all_revs
, o
, "");
1253 else if (!cb
->warned_bad_reflog
) {
1254 warning("reflog of '%s' references pruned commits",
1255 cb
->name_for_errormsg
);
1256 cb
->warned_bad_reflog
= 1;
1261 static int handle_one_reflog_ent(unsigned char *osha1
, unsigned char *nsha1
,
1262 const char *email
, unsigned long timestamp
, int tz
,
1263 const char *message
, void *cb_data
)
1265 handle_one_reflog_commit(osha1
, cb_data
);
1266 handle_one_reflog_commit(nsha1
, cb_data
);
1270 static int handle_one_reflog(const char *path
, const unsigned char *sha1
, int flag
, void *cb_data
)
1272 struct all_refs_cb
*cb
= cb_data
;
1273 cb
->warned_bad_reflog
= 0;
1274 cb
->name_for_errormsg
= path
;
1275 for_each_reflog_ent(path
, handle_one_reflog_ent
, cb_data
);
1279 static void handle_reflog(struct rev_info
*revs
, unsigned flags
)
1281 struct all_refs_cb cb
;
1283 cb
.all_flags
= flags
;
1284 for_each_reflog(handle_one_reflog
, &cb
);
1287 static int add_parents_only(struct rev_info
*revs
, const char *arg_
, int flags
)
1289 unsigned char sha1
[20];
1291 struct commit
*commit
;
1292 struct commit_list
*parents
;
1293 const char *arg
= arg_
;
1296 flags
^= UNINTERESTING
| BOTTOM
;
1299 if (get_sha1_committish(arg
, sha1
))
1302 it
= get_reference(revs
, arg
, sha1
, 0);
1303 if (!it
&& revs
->ignore_missing
)
1305 if (it
->type
!= OBJ_TAG
)
1307 if (!((struct tag
*)it
)->tagged
)
1309 hashcpy(sha1
, ((struct tag
*)it
)->tagged
->sha1
);
1311 if (it
->type
!= OBJ_COMMIT
)
1313 commit
= (struct commit
*)it
;
1314 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
1315 it
= &parents
->item
->object
;
1317 add_rev_cmdline(revs
, it
, arg_
, REV_CMD_PARENTS_ONLY
, flags
);
1318 add_pending_object(revs
, it
, arg
);
1323 void init_revisions(struct rev_info
*revs
, const char *prefix
)
1325 memset(revs
, 0, sizeof(*revs
));
1327 revs
->abbrev
= DEFAULT_ABBREV
;
1328 revs
->ignore_merges
= 1;
1329 revs
->simplify_history
= 1;
1330 DIFF_OPT_SET(&revs
->pruning
, RECURSIVE
);
1331 DIFF_OPT_SET(&revs
->pruning
, QUICK
);
1332 revs
->pruning
.add_remove
= file_add_remove
;
1333 revs
->pruning
.change
= file_change
;
1334 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1336 revs
->prefix
= prefix
;
1339 revs
->skip_count
= -1;
1340 revs
->max_count
= -1;
1341 revs
->max_parents
= -1;
1343 revs
->commit_format
= CMIT_FMT_DEFAULT
;
1345 init_grep_defaults();
1346 grep_init(&revs
->grep_filter
, prefix
);
1347 revs
->grep_filter
.status_only
= 1;
1348 revs
->grep_filter
.regflags
= REG_NEWLINE
;
1350 diff_setup(&revs
->diffopt
);
1351 if (prefix
&& !revs
->diffopt
.prefix
) {
1352 revs
->diffopt
.prefix
= prefix
;
1353 revs
->diffopt
.prefix_length
= strlen(prefix
);
1356 revs
->notes_opt
.use_default_notes
= -1;
1359 static void add_pending_commit_list(struct rev_info
*revs
,
1360 struct commit_list
*commit_list
,
1363 while (commit_list
) {
1364 struct object
*object
= &commit_list
->item
->object
;
1365 object
->flags
|= flags
;
1366 add_pending_object(revs
, object
, sha1_to_hex(object
->sha1
));
1367 commit_list
= commit_list
->next
;
1371 static void prepare_show_merge(struct rev_info
*revs
)
1373 struct commit_list
*bases
;
1374 struct commit
*head
, *other
;
1375 unsigned char sha1
[20];
1376 const char **prune
= NULL
;
1377 int i
, prune_num
= 1; /* counting terminating NULL */
1379 if (get_sha1("HEAD", sha1
))
1380 die("--merge without HEAD?");
1381 head
= lookup_commit_or_die(sha1
, "HEAD");
1382 if (get_sha1("MERGE_HEAD", sha1
))
1383 die("--merge without MERGE_HEAD?");
1384 other
= lookup_commit_or_die(sha1
, "MERGE_HEAD");
1385 add_pending_object(revs
, &head
->object
, "HEAD");
1386 add_pending_object(revs
, &other
->object
, "MERGE_HEAD");
1387 bases
= get_merge_bases(head
, other
, 1);
1388 add_rev_cmdline_list(revs
, bases
, REV_CMD_MERGE_BASE
, UNINTERESTING
| BOTTOM
);
1389 add_pending_commit_list(revs
, bases
, UNINTERESTING
| BOTTOM
);
1390 free_commit_list(bases
);
1391 head
->object
.flags
|= SYMMETRIC_LEFT
;
1395 for (i
= 0; i
< active_nr
; i
++) {
1396 const struct cache_entry
*ce
= active_cache
[i
];
1399 if (ce_path_match(ce
, &revs
->prune_data
)) {
1401 prune
= xrealloc(prune
, sizeof(*prune
) * prune_num
);
1402 prune
[prune_num
-2] = ce
->name
;
1403 prune
[prune_num
-1] = NULL
;
1405 while ((i
+1 < active_nr
) &&
1406 ce_same_name(ce
, active_cache
[i
+1]))
1409 free_pathspec(&revs
->prune_data
);
1410 init_pathspec(&revs
->prune_data
, prune
);
1414 int handle_revision_arg(const char *arg_
, struct rev_info
*revs
, int flags
, unsigned revarg_opt
)
1416 struct object_context oc
;
1418 struct object
*object
;
1419 unsigned char sha1
[20];
1421 const char *arg
= arg_
;
1422 int cant_be_filename
= revarg_opt
& REVARG_CANNOT_BE_FILENAME
;
1423 unsigned get_sha1_flags
= 0;
1425 flags
= flags
& UNINTERESTING
? flags
| BOTTOM
: flags
& ~BOTTOM
;
1427 dotdot
= strstr(arg
, "..");
1429 unsigned char from_sha1
[20];
1430 const char *next
= dotdot
+ 2;
1431 const char *this = arg
;
1432 int symmetric
= *next
== '.';
1433 unsigned int flags_exclude
= flags
^ (UNINTERESTING
| BOTTOM
);
1434 static const char head_by_default
[] = "HEAD";
1435 unsigned int a_flags
;
1441 next
= head_by_default
;
1443 this = head_by_default
;
1444 if (this == head_by_default
&& next
== head_by_default
&&
1447 * Just ".."? That is not a range but the
1448 * pathspec for the parent directory.
1450 if (!cant_be_filename
) {
1455 if (!get_sha1_committish(this, from_sha1
) &&
1456 !get_sha1_committish(next
, sha1
)) {
1457 struct commit
*a
, *b
;
1458 struct commit_list
*exclude
;
1460 a
= lookup_commit_reference(from_sha1
);
1461 b
= lookup_commit_reference(sha1
);
1463 if (revs
->ignore_missing
)
1466 "Invalid symmetric difference expression %s...%s" :
1467 "Invalid revision range %s..%s",
1471 if (!cant_be_filename
) {
1473 verify_non_filename(revs
->prefix
, arg
);
1477 exclude
= get_merge_bases(a
, b
, 1);
1478 add_rev_cmdline_list(revs
, exclude
,
1481 add_pending_commit_list(revs
, exclude
,
1483 free_commit_list(exclude
);
1484 a_flags
= flags
| SYMMETRIC_LEFT
;
1486 a_flags
= flags_exclude
;
1487 a
->object
.flags
|= a_flags
;
1488 b
->object
.flags
|= flags
;
1489 add_rev_cmdline(revs
, &a
->object
, this,
1490 REV_CMD_LEFT
, a_flags
);
1491 add_rev_cmdline(revs
, &b
->object
, next
,
1492 REV_CMD_RIGHT
, flags
);
1493 add_pending_object(revs
, &a
->object
, this);
1494 add_pending_object(revs
, &b
->object
, next
);
1499 dotdot
= strstr(arg
, "^@");
1500 if (dotdot
&& !dotdot
[2]) {
1502 if (add_parents_only(revs
, arg
, flags
))
1506 dotdot
= strstr(arg
, "^!");
1507 if (dotdot
&& !dotdot
[2]) {
1509 if (!add_parents_only(revs
, arg
, flags
^ (UNINTERESTING
| BOTTOM
)))
1515 local_flags
= UNINTERESTING
| BOTTOM
;
1519 if (revarg_opt
& REVARG_COMMITTISH
)
1520 get_sha1_flags
= GET_SHA1_COMMITTISH
;
1522 if (get_sha1_with_context(arg
, get_sha1_flags
, sha1
, &oc
))
1523 return revs
->ignore_missing
? 0 : -1;
1524 if (!cant_be_filename
)
1525 verify_non_filename(revs
->prefix
, arg
);
1526 object
= get_reference(revs
, arg
, sha1
, flags
^ local_flags
);
1527 add_rev_cmdline(revs
, object
, arg_
, REV_CMD_REV
, flags
^ local_flags
);
1528 add_pending_object_with_mode(revs
, object
, arg
, oc
.mode
);
1532 struct cmdline_pathspec
{
1538 static void append_prune_data(struct cmdline_pathspec
*prune
, const char **av
)
1541 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1542 prune
->path
[prune
->nr
++] = *(av
++);
1546 static void read_pathspec_from_stdin(struct rev_info
*revs
, struct strbuf
*sb
,
1547 struct cmdline_pathspec
*prune
)
1549 while (strbuf_getwholeline(sb
, stdin
, '\n') != EOF
) {
1551 if (len
&& sb
->buf
[len
- 1] == '\n')
1552 sb
->buf
[--len
] = '\0';
1553 ALLOC_GROW(prune
->path
, prune
->nr
+1, prune
->alloc
);
1554 prune
->path
[prune
->nr
++] = xstrdup(sb
->buf
);
1558 static void read_revisions_from_stdin(struct rev_info
*revs
,
1559 struct cmdline_pathspec
*prune
)
1562 int seen_dashdash
= 0;
1564 strbuf_init(&sb
, 1000);
1565 while (strbuf_getwholeline(&sb
, stdin
, '\n') != EOF
) {
1567 if (len
&& sb
.buf
[len
- 1] == '\n')
1568 sb
.buf
[--len
] = '\0';
1571 if (sb
.buf
[0] == '-') {
1572 if (len
== 2 && sb
.buf
[1] == '-') {
1576 die("options not supported in --stdin mode");
1578 if (handle_revision_arg(sb
.buf
, revs
, 0,
1579 REVARG_CANNOT_BE_FILENAME
))
1580 die("bad revision '%s'", sb
.buf
);
1583 read_pathspec_from_stdin(revs
, &sb
, prune
);
1584 strbuf_release(&sb
);
1587 static void add_grep(struct rev_info
*revs
, const char *ptn
, enum grep_pat_token what
)
1589 append_grep_pattern(&revs
->grep_filter
, ptn
, "command line", 0, what
);
1592 static void add_header_grep(struct rev_info
*revs
, enum grep_header_field field
, const char *pattern
)
1594 append_header_grep_pattern(&revs
->grep_filter
, field
, pattern
);
1597 static void add_message_grep(struct rev_info
*revs
, const char *pattern
)
1599 add_grep(revs
, pattern
, GREP_PATTERN_BODY
);
1602 static int handle_revision_opt(struct rev_info
*revs
, int argc
, const char **argv
,
1603 int *unkc
, const char **unkv
)
1605 const char *arg
= argv
[0];
1609 /* pseudo revision arguments */
1610 if (!strcmp(arg
, "--all") || !strcmp(arg
, "--branches") ||
1611 !strcmp(arg
, "--tags") || !strcmp(arg
, "--remotes") ||
1612 !strcmp(arg
, "--reflog") || !strcmp(arg
, "--not") ||
1613 !strcmp(arg
, "--no-walk") || !strcmp(arg
, "--do-walk") ||
1614 !strcmp(arg
, "--bisect") || !prefixcmp(arg
, "--glob=") ||
1615 !prefixcmp(arg
, "--branches=") || !prefixcmp(arg
, "--tags=") ||
1616 !prefixcmp(arg
, "--remotes=") || !prefixcmp(arg
, "--no-walk="))
1618 unkv
[(*unkc
)++] = arg
;
1622 if ((argcount
= parse_long_opt("max-count", argv
, &optarg
))) {
1623 revs
->max_count
= atoi(optarg
);
1626 } else if ((argcount
= parse_long_opt("skip", argv
, &optarg
))) {
1627 revs
->skip_count
= atoi(optarg
);
1629 } else if ((*arg
== '-') && isdigit(arg
[1])) {
1630 /* accept -<digit>, like traditional "head" */
1631 revs
->max_count
= atoi(arg
+ 1);
1633 } else if (!strcmp(arg
, "-n")) {
1635 return error("-n requires an argument");
1636 revs
->max_count
= atoi(argv
[1]);
1639 } else if (!prefixcmp(arg
, "-n")) {
1640 revs
->max_count
= atoi(arg
+ 2);
1642 } else if ((argcount
= parse_long_opt("max-age", argv
, &optarg
))) {
1643 revs
->max_age
= atoi(optarg
);
1645 } else if ((argcount
= parse_long_opt("since", argv
, &optarg
))) {
1646 revs
->max_age
= approxidate(optarg
);
1648 } else if ((argcount
= parse_long_opt("after", argv
, &optarg
))) {
1649 revs
->max_age
= approxidate(optarg
);
1651 } else if ((argcount
= parse_long_opt("min-age", argv
, &optarg
))) {
1652 revs
->min_age
= atoi(optarg
);
1654 } else if ((argcount
= parse_long_opt("before", argv
, &optarg
))) {
1655 revs
->min_age
= approxidate(optarg
);
1657 } else if ((argcount
= parse_long_opt("until", argv
, &optarg
))) {
1658 revs
->min_age
= approxidate(optarg
);
1660 } else if (!strcmp(arg
, "--first-parent")) {
1661 revs
->first_parent_only
= 1;
1662 } else if (!strcmp(arg
, "--ancestry-path")) {
1663 revs
->ancestry_path
= 1;
1664 revs
->simplify_history
= 0;
1666 } else if (!strcmp(arg
, "-g") || !strcmp(arg
, "--walk-reflogs")) {
1667 init_reflog_walk(&revs
->reflog_info
);
1668 } else if (!strcmp(arg
, "--default")) {
1670 return error("bad --default argument");
1671 revs
->def
= argv
[1];
1673 } else if (!strcmp(arg
, "--merge")) {
1674 revs
->show_merge
= 1;
1675 } else if (!strcmp(arg
, "--topo-order")) {
1676 revs
->sort_order
= REV_SORT_IN_GRAPH_ORDER
;
1677 revs
->topo_order
= 1;
1678 } else if (!strcmp(arg
, "--simplify-merges")) {
1679 revs
->simplify_merges
= 1;
1680 revs
->topo_order
= 1;
1681 revs
->rewrite_parents
= 1;
1682 revs
->simplify_history
= 0;
1684 } else if (!strcmp(arg
, "--simplify-by-decoration")) {
1685 revs
->simplify_merges
= 1;
1686 revs
->topo_order
= 1;
1687 revs
->rewrite_parents
= 1;
1688 revs
->simplify_history
= 0;
1689 revs
->simplify_by_decoration
= 1;
1692 load_ref_decorations(DECORATE_SHORT_REFS
);
1693 } else if (!strcmp(arg
, "--date-order")) {
1694 revs
->sort_order
= REV_SORT_BY_COMMIT_DATE
;
1695 revs
->topo_order
= 1;
1696 } else if (!strcmp(arg
, "--author-date-order")) {
1697 revs
->sort_order
= REV_SORT_BY_AUTHOR_DATE
;
1698 revs
->topo_order
= 1;
1699 } else if (!prefixcmp(arg
, "--early-output")) {
1703 count
= atoi(arg
+15);
1706 revs
->topo_order
= 1;
1707 revs
->early_output
= count
;
1709 } else if (!strcmp(arg
, "--parents")) {
1710 revs
->rewrite_parents
= 1;
1711 revs
->print_parents
= 1;
1712 } else if (!strcmp(arg
, "--dense")) {
1714 } else if (!strcmp(arg
, "--sparse")) {
1716 } else if (!strcmp(arg
, "--show-all")) {
1718 } else if (!strcmp(arg
, "--remove-empty")) {
1719 revs
->remove_empty_trees
= 1;
1720 } else if (!strcmp(arg
, "--merges")) {
1721 revs
->min_parents
= 2;
1722 } else if (!strcmp(arg
, "--no-merges")) {
1723 revs
->max_parents
= 1;
1724 } else if (!prefixcmp(arg
, "--min-parents=")) {
1725 revs
->min_parents
= atoi(arg
+14);
1726 } else if (!prefixcmp(arg
, "--no-min-parents")) {
1727 revs
->min_parents
= 0;
1728 } else if (!prefixcmp(arg
, "--max-parents=")) {
1729 revs
->max_parents
= atoi(arg
+14);
1730 } else if (!prefixcmp(arg
, "--no-max-parents")) {
1731 revs
->max_parents
= -1;
1732 } else if (!strcmp(arg
, "--boundary")) {
1734 } else if (!strcmp(arg
, "--left-right")) {
1735 revs
->left_right
= 1;
1736 } else if (!strcmp(arg
, "--left-only")) {
1737 if (revs
->right_only
)
1738 die("--left-only is incompatible with --right-only"
1740 revs
->left_only
= 1;
1741 } else if (!strcmp(arg
, "--right-only")) {
1742 if (revs
->left_only
)
1743 die("--right-only is incompatible with --left-only");
1744 revs
->right_only
= 1;
1745 } else if (!strcmp(arg
, "--cherry")) {
1746 if (revs
->left_only
)
1747 die("--cherry is incompatible with --left-only");
1748 revs
->cherry_mark
= 1;
1749 revs
->right_only
= 1;
1750 revs
->max_parents
= 1;
1752 } else if (!strcmp(arg
, "--count")) {
1754 } else if (!strcmp(arg
, "--cherry-mark")) {
1755 if (revs
->cherry_pick
)
1756 die("--cherry-mark is incompatible with --cherry-pick");
1757 revs
->cherry_mark
= 1;
1758 revs
->limited
= 1; /* needs limit_list() */
1759 } else if (!strcmp(arg
, "--cherry-pick")) {
1760 if (revs
->cherry_mark
)
1761 die("--cherry-pick is incompatible with --cherry-mark");
1762 revs
->cherry_pick
= 1;
1764 } else if (!strcmp(arg
, "--objects")) {
1765 revs
->tag_objects
= 1;
1766 revs
->tree_objects
= 1;
1767 revs
->blob_objects
= 1;
1768 } else if (!strcmp(arg
, "--objects-edge")) {
1769 revs
->tag_objects
= 1;
1770 revs
->tree_objects
= 1;
1771 revs
->blob_objects
= 1;
1772 revs
->edge_hint
= 1;
1773 } else if (!strcmp(arg
, "--verify-objects")) {
1774 revs
->tag_objects
= 1;
1775 revs
->tree_objects
= 1;
1776 revs
->blob_objects
= 1;
1777 revs
->verify_objects
= 1;
1778 } else if (!strcmp(arg
, "--unpacked")) {
1780 } else if (!prefixcmp(arg
, "--unpacked=")) {
1781 die("--unpacked=<packfile> no longer supported.");
1782 } else if (!strcmp(arg
, "-r")) {
1784 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1785 } else if (!strcmp(arg
, "-t")) {
1787 DIFF_OPT_SET(&revs
->diffopt
, RECURSIVE
);
1788 DIFF_OPT_SET(&revs
->diffopt
, TREE_IN_RECURSIVE
);
1789 } else if (!strcmp(arg
, "-m")) {
1790 revs
->ignore_merges
= 0;
1791 } else if (!strcmp(arg
, "-c")) {
1793 revs
->dense_combined_merges
= 0;
1794 revs
->combine_merges
= 1;
1795 } else if (!strcmp(arg
, "--cc")) {
1797 revs
->dense_combined_merges
= 1;
1798 revs
->combine_merges
= 1;
1799 } else if (!strcmp(arg
, "-v")) {
1800 revs
->verbose_header
= 1;
1801 } else if (!strcmp(arg
, "--pretty")) {
1802 revs
->verbose_header
= 1;
1803 revs
->pretty_given
= 1;
1804 get_commit_format(arg
+8, revs
);
1805 } else if (!prefixcmp(arg
, "--pretty=") || !prefixcmp(arg
, "--format=")) {
1807 * Detached form ("--pretty X" as opposed to "--pretty=X")
1808 * not allowed, since the argument is optional.
1810 revs
->verbose_header
= 1;
1811 revs
->pretty_given
= 1;
1812 get_commit_format(arg
+9, revs
);
1813 } else if (!strcmp(arg
, "--show-notes") || !strcmp(arg
, "--notes")) {
1814 revs
->show_notes
= 1;
1815 revs
->show_notes_given
= 1;
1816 revs
->notes_opt
.use_default_notes
= 1;
1817 } else if (!strcmp(arg
, "--show-signature")) {
1818 revs
->show_signature
= 1;
1819 } else if (!prefixcmp(arg
, "--show-notes=") ||
1820 !prefixcmp(arg
, "--notes=")) {
1821 struct strbuf buf
= STRBUF_INIT
;
1822 revs
->show_notes
= 1;
1823 revs
->show_notes_given
= 1;
1824 if (!prefixcmp(arg
, "--show-notes")) {
1825 if (revs
->notes_opt
.use_default_notes
< 0)
1826 revs
->notes_opt
.use_default_notes
= 1;
1827 strbuf_addstr(&buf
, arg
+13);
1830 strbuf_addstr(&buf
, arg
+8);
1831 expand_notes_ref(&buf
);
1832 string_list_append(&revs
->notes_opt
.extra_notes_refs
,
1833 strbuf_detach(&buf
, NULL
));
1834 } else if (!strcmp(arg
, "--no-notes")) {
1835 revs
->show_notes
= 0;
1836 revs
->show_notes_given
= 1;
1837 revs
->notes_opt
.use_default_notes
= -1;
1838 /* we have been strdup'ing ourselves, so trick
1839 * string_list into free()ing strings */
1840 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 1;
1841 string_list_clear(&revs
->notes_opt
.extra_notes_refs
, 0);
1842 revs
->notes_opt
.extra_notes_refs
.strdup_strings
= 0;
1843 } else if (!strcmp(arg
, "--standard-notes")) {
1844 revs
->show_notes_given
= 1;
1845 revs
->notes_opt
.use_default_notes
= 1;
1846 } else if (!strcmp(arg
, "--no-standard-notes")) {
1847 revs
->notes_opt
.use_default_notes
= 0;
1848 } else if (!strcmp(arg
, "--oneline")) {
1849 revs
->verbose_header
= 1;
1850 get_commit_format("oneline", revs
);
1851 revs
->pretty_given
= 1;
1852 revs
->abbrev_commit
= 1;
1853 } else if (!strcmp(arg
, "--graph")) {
1854 revs
->topo_order
= 1;
1855 revs
->rewrite_parents
= 1;
1856 revs
->graph
= graph_init(revs
);
1857 } else if (!strcmp(arg
, "--root")) {
1858 revs
->show_root_diff
= 1;
1859 } else if (!strcmp(arg
, "--no-commit-id")) {
1860 revs
->no_commit_id
= 1;
1861 } else if (!strcmp(arg
, "--always")) {
1862 revs
->always_show_header
= 1;
1863 } else if (!strcmp(arg
, "--no-abbrev")) {
1865 } else if (!strcmp(arg
, "--abbrev")) {
1866 revs
->abbrev
= DEFAULT_ABBREV
;
1867 } else if (!prefixcmp(arg
, "--abbrev=")) {
1868 revs
->abbrev
= strtoul(arg
+ 9, NULL
, 10);
1869 if (revs
->abbrev
< MINIMUM_ABBREV
)
1870 revs
->abbrev
= MINIMUM_ABBREV
;
1871 else if (revs
->abbrev
> 40)
1873 } else if (!strcmp(arg
, "--abbrev-commit")) {
1874 revs
->abbrev_commit
= 1;
1875 revs
->abbrev_commit_given
= 1;
1876 } else if (!strcmp(arg
, "--no-abbrev-commit")) {
1877 revs
->abbrev_commit
= 0;
1878 } else if (!strcmp(arg
, "--full-diff")) {
1880 revs
->full_diff
= 1;
1881 } else if (!strcmp(arg
, "--full-history")) {
1882 revs
->simplify_history
= 0;
1883 } else if (!strcmp(arg
, "--relative-date")) {
1884 revs
->date_mode
= DATE_RELATIVE
;
1885 revs
->date_mode_explicit
= 1;
1886 } else if ((argcount
= parse_long_opt("date", argv
, &optarg
))) {
1887 revs
->date_mode
= parse_date_format(optarg
);
1888 revs
->date_mode_explicit
= 1;
1890 } else if (!strcmp(arg
, "--log-size")) {
1891 revs
->show_log_size
= 1;
1894 * Grepping the commit log
1896 else if ((argcount
= parse_long_opt("author", argv
, &optarg
))) {
1897 add_header_grep(revs
, GREP_HEADER_AUTHOR
, optarg
);
1899 } else if ((argcount
= parse_long_opt("committer", argv
, &optarg
))) {
1900 add_header_grep(revs
, GREP_HEADER_COMMITTER
, optarg
);
1902 } else if ((argcount
= parse_long_opt("grep-reflog", argv
, &optarg
))) {
1903 add_header_grep(revs
, GREP_HEADER_REFLOG
, optarg
);
1905 } else if ((argcount
= parse_long_opt("grep", argv
, &optarg
))) {
1906 add_message_grep(revs
, optarg
);
1908 } else if (!strcmp(arg
, "--grep-debug")) {
1909 revs
->grep_filter
.debug
= 1;
1910 } else if (!strcmp(arg
, "--basic-regexp")) {
1911 grep_set_pattern_type_option(GREP_PATTERN_TYPE_BRE
, &revs
->grep_filter
);
1912 } else if (!strcmp(arg
, "--extended-regexp") || !strcmp(arg
, "-E")) {
1913 grep_set_pattern_type_option(GREP_PATTERN_TYPE_ERE
, &revs
->grep_filter
);
1914 } else if (!strcmp(arg
, "--regexp-ignore-case") || !strcmp(arg
, "-i")) {
1915 revs
->grep_filter
.regflags
|= REG_ICASE
;
1916 DIFF_OPT_SET(&revs
->diffopt
, PICKAXE_IGNORE_CASE
);
1917 } else if (!strcmp(arg
, "--fixed-strings") || !strcmp(arg
, "-F")) {
1918 grep_set_pattern_type_option(GREP_PATTERN_TYPE_FIXED
, &revs
->grep_filter
);
1919 } else if (!strcmp(arg
, "--perl-regexp")) {
1920 grep_set_pattern_type_option(GREP_PATTERN_TYPE_PCRE
, &revs
->grep_filter
);
1921 } else if (!strcmp(arg
, "--all-match")) {
1922 revs
->grep_filter
.all_match
= 1;
1923 } else if ((argcount
= parse_long_opt("encoding", argv
, &optarg
))) {
1924 if (strcmp(optarg
, "none"))
1925 git_log_output_encoding
= xstrdup(optarg
);
1927 git_log_output_encoding
= "";
1929 } else if (!strcmp(arg
, "--reverse")) {
1931 } else if (!strcmp(arg
, "--children")) {
1932 revs
->children
.name
= "children";
1934 } else if (!strcmp(arg
, "--ignore-missing")) {
1935 revs
->ignore_missing
= 1;
1937 int opts
= diff_opt_parse(&revs
->diffopt
, argv
, argc
);
1939 unkv
[(*unkc
)++] = arg
;
1946 void parse_revision_opt(struct rev_info
*revs
, struct parse_opt_ctx_t
*ctx
,
1947 const struct option
*options
,
1948 const char * const usagestr
[])
1950 int n
= handle_revision_opt(revs
, ctx
->argc
, ctx
->argv
,
1951 &ctx
->cpidx
, ctx
->out
);
1953 error("unknown option `%s'", ctx
->argv
[0]);
1954 usage_with_options(usagestr
, options
);
1960 static int for_each_bad_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1962 return for_each_ref_in_submodule(submodule
, "refs/bisect/bad", fn
, cb_data
);
1965 static int for_each_good_bisect_ref(const char *submodule
, each_ref_fn fn
, void *cb_data
)
1967 return for_each_ref_in_submodule(submodule
, "refs/bisect/good", fn
, cb_data
);
1970 static int handle_revision_pseudo_opt(const char *submodule
,
1971 struct rev_info
*revs
,
1972 int argc
, const char **argv
, int *flags
)
1974 const char *arg
= argv
[0];
1981 * Commands like "git shortlog" will not accept the options below
1982 * unless parse_revision_opt queues them (as opposed to erroring
1985 * When implementing your new pseudo-option, remember to
1986 * register it in the list at the top of handle_revision_opt.
1988 if (!strcmp(arg
, "--all")) {
1989 handle_refs(submodule
, revs
, *flags
, for_each_ref_submodule
);
1990 handle_refs(submodule
, revs
, *flags
, head_ref_submodule
);
1991 clear_ref_exclusion(revs
);
1992 } else if (!strcmp(arg
, "--branches")) {
1993 handle_refs(submodule
, revs
, *flags
, for_each_branch_ref_submodule
);
1994 clear_ref_exclusion(revs
);
1995 } else if (!strcmp(arg
, "--bisect")) {
1996 handle_refs(submodule
, revs
, *flags
, for_each_bad_bisect_ref
);
1997 handle_refs(submodule
, revs
, *flags
^ (UNINTERESTING
| BOTTOM
), for_each_good_bisect_ref
);
1999 } else if (!strcmp(arg
, "--tags")) {
2000 handle_refs(submodule
, revs
, *flags
, for_each_tag_ref_submodule
);
2001 clear_ref_exclusion(revs
);
2002 } else if (!strcmp(arg
, "--remotes")) {
2003 handle_refs(submodule
, revs
, *flags
, for_each_remote_ref_submodule
);
2004 clear_ref_exclusion(revs
);
2005 } else if ((argcount
= parse_long_opt("glob", argv
, &optarg
))) {
2006 struct all_refs_cb cb
;
2007 init_all_refs_cb(&cb
, revs
, *flags
);
2008 for_each_glob_ref(handle_one_ref
, optarg
, &cb
);
2009 clear_ref_exclusion(revs
);
2011 } else if ((argcount
= parse_long_opt("exclude", argv
, &optarg
))) {
2012 add_ref_exclusion(revs
, optarg
);
2014 } else if (!prefixcmp(arg
, "--branches=")) {
2015 struct all_refs_cb cb
;
2016 init_all_refs_cb(&cb
, revs
, *flags
);
2017 for_each_glob_ref_in(handle_one_ref
, arg
+ 11, "refs/heads/", &cb
);
2018 clear_ref_exclusion(revs
);
2019 } else if (!prefixcmp(arg
, "--tags=")) {
2020 struct all_refs_cb cb
;
2021 init_all_refs_cb(&cb
, revs
, *flags
);
2022 for_each_glob_ref_in(handle_one_ref
, arg
+ 7, "refs/tags/", &cb
);
2023 clear_ref_exclusion(revs
);
2024 } else if (!prefixcmp(arg
, "--remotes=")) {
2025 struct all_refs_cb cb
;
2026 init_all_refs_cb(&cb
, revs
, *flags
);
2027 for_each_glob_ref_in(handle_one_ref
, arg
+ 10, "refs/remotes/", &cb
);
2028 clear_ref_exclusion(revs
);
2029 } else if (!strcmp(arg
, "--reflog")) {
2030 handle_reflog(revs
, *flags
);
2031 } else if (!strcmp(arg
, "--not")) {
2032 *flags
^= UNINTERESTING
| BOTTOM
;
2033 } else if (!strcmp(arg
, "--no-walk")) {
2034 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2035 } else if (!prefixcmp(arg
, "--no-walk=")) {
2037 * Detached form ("--no-walk X" as opposed to "--no-walk=X")
2038 * not allowed, since the argument is optional.
2040 if (!strcmp(arg
+ 10, "sorted"))
2041 revs
->no_walk
= REVISION_WALK_NO_WALK_SORTED
;
2042 else if (!strcmp(arg
+ 10, "unsorted"))
2043 revs
->no_walk
= REVISION_WALK_NO_WALK_UNSORTED
;
2045 return error("invalid argument to --no-walk");
2046 } else if (!strcmp(arg
, "--do-walk")) {
2056 * Parse revision information, filling in the "rev_info" structure,
2057 * and removing the used arguments from the argument list.
2059 * Returns the number of arguments left that weren't recognized
2060 * (which are also moved to the head of the argument list)
2062 int setup_revisions(int argc
, const char **argv
, struct rev_info
*revs
, struct setup_revision_opt
*opt
)
2064 int i
, flags
, left
, seen_dashdash
, read_from_stdin
, got_rev_arg
= 0, revarg_opt
;
2065 struct cmdline_pathspec prune_data
;
2066 const char *submodule
= NULL
;
2068 memset(&prune_data
, 0, sizeof(prune_data
));
2070 submodule
= opt
->submodule
;
2072 /* First, search for "--" */
2073 if (opt
&& opt
->assume_dashdash
) {
2077 for (i
= 1; i
< argc
; i
++) {
2078 const char *arg
= argv
[i
];
2079 if (strcmp(arg
, "--"))
2084 append_prune_data(&prune_data
, argv
+ i
+ 1);
2090 /* Second, deal with arguments and options */
2092 revarg_opt
= opt
? opt
->revarg_opt
: 0;
2094 revarg_opt
|= REVARG_CANNOT_BE_FILENAME
;
2095 read_from_stdin
= 0;
2096 for (left
= i
= 1; i
< argc
; i
++) {
2097 const char *arg
= argv
[i
];
2101 opts
= handle_revision_pseudo_opt(submodule
,
2102 revs
, argc
- i
, argv
+ i
,
2109 if (!strcmp(arg
, "--stdin")) {
2110 if (revs
->disable_stdin
) {
2114 if (read_from_stdin
++)
2115 die("--stdin given twice?");
2116 read_revisions_from_stdin(revs
, &prune_data
);
2120 opts
= handle_revision_opt(revs
, argc
- i
, argv
+ i
, &left
, argv
);
2131 if (handle_revision_arg(arg
, revs
, flags
, revarg_opt
)) {
2133 if (seen_dashdash
|| *arg
== '^')
2134 die("bad revision '%s'", arg
);
2136 /* If we didn't have a "--":
2137 * (1) all filenames must exist;
2138 * (2) all rev-args must not be interpretable
2139 * as a valid filename.
2140 * but the latter we have checked in the main loop.
2142 for (j
= i
; j
< argc
; j
++)
2143 verify_filename(revs
->prefix
, argv
[j
], j
== i
);
2145 append_prune_data(&prune_data
, argv
+ i
);
2152 if (prune_data
.nr
) {
2154 * If we need to introduce the magic "a lone ':' means no
2155 * pathspec whatsoever", here is the place to do so.
2157 * if (prune_data.nr == 1 && !strcmp(prune_data[0], ":")) {
2158 * prune_data.nr = 0;
2159 * prune_data.alloc = 0;
2160 * free(prune_data.path);
2161 * prune_data.path = NULL;
2163 * terminate prune_data.alloc with NULL and
2164 * call init_pathspec() to set revs->prune_data here.
2167 ALLOC_GROW(prune_data
.path
, prune_data
.nr
+1, prune_data
.alloc
);
2168 prune_data
.path
[prune_data
.nr
++] = NULL
;
2169 init_pathspec(&revs
->prune_data
,
2170 get_pathspec(revs
->prefix
, prune_data
.path
));
2173 if (revs
->def
== NULL
)
2174 revs
->def
= opt
? opt
->def
: NULL
;
2175 if (opt
&& opt
->tweak
)
2176 opt
->tweak(revs
, opt
);
2177 if (revs
->show_merge
)
2178 prepare_show_merge(revs
);
2179 if (revs
->def
&& !revs
->pending
.nr
&& !got_rev_arg
) {
2180 unsigned char sha1
[20];
2181 struct object
*object
;
2182 struct object_context oc
;
2183 if (get_sha1_with_context(revs
->def
, 0, sha1
, &oc
))
2184 die("bad default revision '%s'", revs
->def
);
2185 object
= get_reference(revs
, revs
->def
, sha1
, 0);
2186 add_pending_object_with_mode(revs
, object
, revs
->def
, oc
.mode
);
2189 /* Did the user ask for any diff output? Run the diff! */
2190 if (revs
->diffopt
.output_format
& ~DIFF_FORMAT_NO_OUTPUT
)
2193 /* Pickaxe, diff-filter and rename following need diffs */
2194 if (revs
->diffopt
.pickaxe
||
2195 revs
->diffopt
.filter
||
2196 DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2199 if (revs
->topo_order
)
2202 if (revs
->prune_data
.nr
) {
2203 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->pruning
);
2204 /* Can't prune commits with rename following: the paths change.. */
2205 if (!DIFF_OPT_TST(&revs
->diffopt
, FOLLOW_RENAMES
))
2207 if (!revs
->full_diff
)
2208 diff_tree_setup_paths(revs
->prune_data
.raw
, &revs
->diffopt
);
2210 if (revs
->combine_merges
)
2211 revs
->ignore_merges
= 0;
2212 revs
->diffopt
.abbrev
= revs
->abbrev
;
2214 if (revs
->line_level_traverse
) {
2216 revs
->topo_order
= 1;
2219 diff_setup_done(&revs
->diffopt
);
2221 grep_commit_pattern_type(GREP_PATTERN_TYPE_UNSPECIFIED
,
2222 &revs
->grep_filter
);
2223 compile_grep_patterns(&revs
->grep_filter
);
2225 if (revs
->reverse
&& revs
->reflog_info
)
2226 die("cannot combine --reverse with --walk-reflogs");
2227 if (revs
->rewrite_parents
&& revs
->children
.name
)
2228 die("cannot combine --parents and --children");
2231 * Limitations on the graph functionality
2233 if (revs
->reverse
&& revs
->graph
)
2234 die("cannot combine --reverse with --graph");
2236 if (revs
->reflog_info
&& revs
->graph
)
2237 die("cannot combine --walk-reflogs with --graph");
2238 if (!revs
->reflog_info
&& revs
->grep_filter
.use_reflog_filter
)
2239 die("cannot use --grep-reflog without --walk-reflogs");
2244 static void add_child(struct rev_info
*revs
, struct commit
*parent
, struct commit
*child
)
2246 struct commit_list
*l
= xcalloc(1, sizeof(*l
));
2249 l
->next
= add_decoration(&revs
->children
, &parent
->object
, l
);
2252 static int remove_duplicate_parents(struct rev_info
*revs
, struct commit
*commit
)
2254 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2255 struct commit_list
**pp
, *p
;
2256 int surviving_parents
;
2258 /* Examine existing parents while marking ones we have seen... */
2259 pp
= &commit
->parents
;
2260 surviving_parents
= 0;
2261 while ((p
= *pp
) != NULL
) {
2262 struct commit
*parent
= p
->item
;
2263 if (parent
->object
.flags
& TMP_MARK
) {
2266 compact_treesame(revs
, commit
, surviving_parents
);
2269 parent
->object
.flags
|= TMP_MARK
;
2270 surviving_parents
++;
2273 /* clear the temporary mark */
2274 for (p
= commit
->parents
; p
; p
= p
->next
) {
2275 p
->item
->object
.flags
&= ~TMP_MARK
;
2277 /* no update_treesame() - removing duplicates can't affect TREESAME */
2278 return surviving_parents
;
2281 struct merge_simplify_state
{
2282 struct commit
*simplified
;
2285 static struct merge_simplify_state
*locate_simplify_state(struct rev_info
*revs
, struct commit
*commit
)
2287 struct merge_simplify_state
*st
;
2289 st
= lookup_decoration(&revs
->merge_simplification
, &commit
->object
);
2291 st
= xcalloc(1, sizeof(*st
));
2292 add_decoration(&revs
->merge_simplification
, &commit
->object
, st
);
2297 static int mark_redundant_parents(struct rev_info
*revs
, struct commit
*commit
)
2299 struct commit_list
*h
= reduce_heads(commit
->parents
);
2300 int i
= 0, marked
= 0;
2301 struct commit_list
*po
, *pn
;
2303 /* Want these for sanity-checking only */
2304 int orig_cnt
= commit_list_count(commit
->parents
);
2305 int cnt
= commit_list_count(h
);
2308 * Not ready to remove items yet, just mark them for now, based
2309 * on the output of reduce_heads(). reduce_heads outputs the reduced
2310 * set in its original order, so this isn't too hard.
2312 po
= commit
->parents
;
2315 if (pn
&& po
->item
== pn
->item
) {
2319 po
->item
->object
.flags
|= TMP_MARK
;
2325 if (i
!= cnt
|| cnt
+marked
!= orig_cnt
)
2326 die("mark_redundant_parents %d %d %d %d", orig_cnt
, cnt
, i
, marked
);
2328 free_commit_list(h
);
2333 static int mark_treesame_root_parents(struct rev_info
*revs
, struct commit
*commit
)
2335 struct commit_list
*p
;
2338 for (p
= commit
->parents
; p
; p
= p
->next
) {
2339 struct commit
*parent
= p
->item
;
2340 if (!parent
->parents
&& (parent
->object
.flags
& TREESAME
)) {
2341 parent
->object
.flags
|= TMP_MARK
;
2350 * Awkward naming - this means one parent we are TREESAME to.
2351 * cf mark_treesame_root_parents: root parents that are TREESAME (to an
2352 * empty tree). Better name suggestions?
2354 static int leave_one_treesame_to_parent(struct rev_info
*revs
, struct commit
*commit
)
2356 struct treesame_state
*ts
= lookup_decoration(&revs
->treesame
, &commit
->object
);
2357 struct commit
*unmarked
= NULL
, *marked
= NULL
;
2358 struct commit_list
*p
;
2361 for (p
= commit
->parents
, n
= 0; p
; p
= p
->next
, n
++) {
2362 if (ts
->treesame
[n
]) {
2363 if (p
->item
->object
.flags
& TMP_MARK
) {
2376 * If we are TREESAME to a marked-for-deletion parent, but not to any
2377 * unmarked parents, unmark the first TREESAME parent. This is the
2378 * parent that the default simplify_history==1 scan would have followed,
2379 * and it doesn't make sense to omit that path when asking for a
2380 * simplified full history. Retaining it improves the chances of
2381 * understanding odd missed merges that took an old version of a file.
2385 * I--------*X A modified the file, but mainline merge X used
2386 * \ / "-s ours", so took the version from I. X is
2387 * `-*A--' TREESAME to I and !TREESAME to A.
2389 * Default log from X would produce "I". Without this check,
2390 * --full-history --simplify-merges would produce "I-A-X", showing
2391 * the merge commit X and that it changed A, but not making clear that
2392 * it had just taken the I version. With this check, the topology above
2395 * Note that it is possible that the simplification chooses a different
2396 * TREESAME parent from the default, in which case this test doesn't
2397 * activate, and we _do_ drop the default parent. Example:
2399 * I------X A modified the file, but it was reverted in B,
2400 * \ / meaning mainline merge X is TREESAME to both
2403 * Default log would produce "I" by following the first parent;
2404 * --full-history --simplify-merges will produce "I-A-B". But this is a
2405 * reasonable result - it presents a logical full history leading from
2406 * I to X, and X is not an important merge.
2408 if (!unmarked
&& marked
) {
2409 marked
->object
.flags
&= ~TMP_MARK
;
2416 static int remove_marked_parents(struct rev_info
*revs
, struct commit
*commit
)
2418 struct commit_list
**pp
, *p
;
2419 int nth_parent
, removed
= 0;
2421 pp
= &commit
->parents
;
2423 while ((p
= *pp
) != NULL
) {
2424 struct commit
*parent
= p
->item
;
2425 if (parent
->object
.flags
& TMP_MARK
) {
2426 parent
->object
.flags
&= ~TMP_MARK
;
2430 compact_treesame(revs
, commit
, nth_parent
);
2437 /* Removing parents can only increase TREESAMEness */
2438 if (removed
&& !(commit
->object
.flags
& TREESAME
))
2439 update_treesame(revs
, commit
);
2444 static struct commit_list
**simplify_one(struct rev_info
*revs
, struct commit
*commit
, struct commit_list
**tail
)
2446 struct commit_list
*p
;
2447 struct commit
*parent
;
2448 struct merge_simplify_state
*st
, *pst
;
2451 st
= locate_simplify_state(revs
, commit
);
2454 * Have we handled this one?
2460 * An UNINTERESTING commit simplifies to itself, so does a
2461 * root commit. We do not rewrite parents of such commit
2464 if ((commit
->object
.flags
& UNINTERESTING
) || !commit
->parents
) {
2465 st
->simplified
= commit
;
2470 * Do we know what commit all of our parents that matter
2471 * should be rewritten to? Otherwise we are not ready to
2472 * rewrite this one yet.
2474 for (cnt
= 0, p
= commit
->parents
; p
; p
= p
->next
) {
2475 pst
= locate_simplify_state(revs
, p
->item
);
2476 if (!pst
->simplified
) {
2477 tail
= &commit_list_insert(p
->item
, tail
)->next
;
2480 if (revs
->first_parent_only
)
2484 tail
= &commit_list_insert(commit
, tail
)->next
;
2489 * Rewrite our list of parents. Note that this cannot
2490 * affect our TREESAME flags in any way - a commit is
2491 * always TREESAME to its simplification.
2493 for (p
= commit
->parents
; p
; p
= p
->next
) {
2494 pst
= locate_simplify_state(revs
, p
->item
);
2495 p
->item
= pst
->simplified
;
2496 if (revs
->first_parent_only
)
2500 if (revs
->first_parent_only
)
2503 cnt
= remove_duplicate_parents(revs
, commit
);
2506 * It is possible that we are a merge and one side branch
2507 * does not have any commit that touches the given paths;
2508 * in such a case, the immediate parent from that branch
2509 * will be rewritten to be the merge base.
2511 * o----X X: the commit we are looking at;
2512 * / / o: a commit that touches the paths;
2515 * Further, a merge of an independent branch that doesn't
2516 * touch the path will reduce to a treesame root parent:
2518 * ----o----X X: the commit we are looking at;
2519 * / o: a commit that touches the paths;
2520 * r r: a root commit not touching the paths
2522 * Detect and simplify both cases.
2525 int marked
= mark_redundant_parents(revs
, commit
);
2526 marked
+= mark_treesame_root_parents(revs
, commit
);
2528 marked
-= leave_one_treesame_to_parent(revs
, commit
);
2530 cnt
= remove_marked_parents(revs
, commit
);
2534 * A commit simplifies to itself if it is a root, if it is
2535 * UNINTERESTING, if it touches the given paths, or if it is a
2536 * merge and its parents don't simplify to one relevant commit
2537 * (the first two cases are already handled at the beginning of
2540 * Otherwise, it simplifies to what its sole relevant parent
2544 (commit
->object
.flags
& UNINTERESTING
) ||
2545 !(commit
->object
.flags
& TREESAME
) ||
2546 (parent
= one_relevant_parent(revs
, commit
->parents
)) == NULL
)
2547 st
->simplified
= commit
;
2549 pst
= locate_simplify_state(revs
, parent
);
2550 st
->simplified
= pst
->simplified
;
2555 static void simplify_merges(struct rev_info
*revs
)
2557 struct commit_list
*list
, *next
;
2558 struct commit_list
*yet_to_do
, **tail
;
2559 struct commit
*commit
;
2564 /* feed the list reversed */
2566 for (list
= revs
->commits
; list
; list
= next
) {
2567 commit
= list
->item
;
2570 * Do not free(list) here yet; the original list
2571 * is used later in this function.
2573 commit_list_insert(commit
, &yet_to_do
);
2580 commit
= list
->item
;
2584 tail
= simplify_one(revs
, commit
, tail
);
2588 /* clean up the result, removing the simplified ones */
2589 list
= revs
->commits
;
2590 revs
->commits
= NULL
;
2591 tail
= &revs
->commits
;
2593 struct merge_simplify_state
*st
;
2595 commit
= list
->item
;
2599 st
= locate_simplify_state(revs
, commit
);
2600 if (st
->simplified
== commit
)
2601 tail
= &commit_list_insert(commit
, tail
)->next
;
2605 static void set_children(struct rev_info
*revs
)
2607 struct commit_list
*l
;
2608 for (l
= revs
->commits
; l
; l
= l
->next
) {
2609 struct commit
*commit
= l
->item
;
2610 struct commit_list
*p
;
2612 for (p
= commit
->parents
; p
; p
= p
->next
)
2613 add_child(revs
, p
->item
, commit
);
2617 void reset_revision_walk(void)
2619 clear_object_flags(SEEN
| ADDED
| SHOWN
);
2622 int prepare_revision_walk(struct rev_info
*revs
)
2624 int nr
= revs
->pending
.nr
;
2625 struct object_array_entry
*e
, *list
;
2626 struct commit_list
**next
= &revs
->commits
;
2628 e
= list
= revs
->pending
.objects
;
2629 revs
->pending
.nr
= 0;
2630 revs
->pending
.alloc
= 0;
2631 revs
->pending
.objects
= NULL
;
2633 struct commit
*commit
= handle_commit(revs
, e
->item
, e
->name
);
2635 if (!(commit
->object
.flags
& SEEN
)) {
2636 commit
->object
.flags
|= SEEN
;
2637 next
= commit_list_append(commit
, next
);
2642 if (!revs
->leak_pending
)
2645 /* Signal whether we need per-parent treesame decoration */
2646 if (revs
->simplify_merges
||
2647 (revs
->limited
&& limiting_can_increase_treesame(revs
)))
2648 revs
->treesame
.name
= "treesame";
2650 if (revs
->no_walk
!= REVISION_WALK_NO_WALK_UNSORTED
)
2651 commit_list_sort_by_date(&revs
->commits
);
2655 if (limit_list(revs
) < 0)
2657 if (revs
->topo_order
)
2658 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2659 if (revs
->line_level_traverse
)
2660 line_log_filter(revs
);
2661 if (revs
->simplify_merges
)
2662 simplify_merges(revs
);
2663 if (revs
->children
.name
)
2668 static enum rewrite_result
rewrite_one(struct rev_info
*revs
, struct commit
**pp
)
2670 struct commit_list
*cache
= NULL
;
2673 struct commit
*p
= *pp
;
2675 if (add_parents_to_list(revs
, p
, &revs
->commits
, &cache
) < 0)
2676 return rewrite_one_error
;
2677 if (p
->object
.flags
& UNINTERESTING
)
2678 return rewrite_one_ok
;
2679 if (!(p
->object
.flags
& TREESAME
))
2680 return rewrite_one_ok
;
2682 return rewrite_one_noparents
;
2683 if ((p
= one_relevant_parent(revs
, p
->parents
)) == NULL
)
2684 return rewrite_one_ok
;
2689 int rewrite_parents(struct rev_info
*revs
, struct commit
*commit
,
2690 rewrite_parent_fn_t rewrite_parent
)
2692 struct commit_list
**pp
= &commit
->parents
;
2694 struct commit_list
*parent
= *pp
;
2695 switch (rewrite_parent(revs
, &parent
->item
)) {
2696 case rewrite_one_ok
:
2698 case rewrite_one_noparents
:
2701 case rewrite_one_error
:
2706 remove_duplicate_parents(revs
, commit
);
2710 static int commit_rewrite_person(struct strbuf
*buf
, const char *what
, struct string_list
*mailmap
)
2712 char *person
, *endp
;
2713 size_t len
, namelen
, maillen
;
2716 struct ident_split ident
;
2718 person
= strstr(buf
->buf
, what
);
2722 person
+= strlen(what
);
2723 endp
= strchr(person
, '\n');
2727 len
= endp
- person
;
2729 if (split_ident_line(&ident
, person
, len
))
2732 mail
= ident
.mail_begin
;
2733 maillen
= ident
.mail_end
- ident
.mail_begin
;
2734 name
= ident
.name_begin
;
2735 namelen
= ident
.name_end
- ident
.name_begin
;
2737 if (map_user(mailmap
, &mail
, &maillen
, &name
, &namelen
)) {
2738 struct strbuf namemail
= STRBUF_INIT
;
2740 strbuf_addf(&namemail
, "%.*s <%.*s>",
2741 (int)namelen
, name
, (int)maillen
, mail
);
2743 strbuf_splice(buf
, ident
.name_begin
- buf
->buf
,
2744 ident
.mail_end
- ident
.name_begin
+ 1,
2745 namemail
.buf
, namemail
.len
);
2747 strbuf_release(&namemail
);
2755 static int commit_match(struct commit
*commit
, struct rev_info
*opt
)
2758 const char *encoding
;
2760 struct strbuf buf
= STRBUF_INIT
;
2762 if (!opt
->grep_filter
.pattern_list
&& !opt
->grep_filter
.header_list
)
2765 /* Prepend "fake" headers as needed */
2766 if (opt
->grep_filter
.use_reflog_filter
) {
2767 strbuf_addstr(&buf
, "reflog ");
2768 get_reflog_message(&buf
, opt
->reflog_info
);
2769 strbuf_addch(&buf
, '\n');
2773 * We grep in the user's output encoding, under the assumption that it
2774 * is the encoding they are most likely to write their grep pattern
2775 * for. In addition, it means we will match the "notes" encoding below,
2776 * so we will not end up with a buffer that has two different encodings
2779 encoding
= get_log_output_encoding();
2780 message
= logmsg_reencode(commit
, NULL
, encoding
);
2782 /* Copy the commit to temporary if we are using "fake" headers */
2784 strbuf_addstr(&buf
, message
);
2786 if (opt
->grep_filter
.header_list
&& opt
->mailmap
) {
2788 strbuf_addstr(&buf
, message
);
2790 commit_rewrite_person(&buf
, "\nauthor ", opt
->mailmap
);
2791 commit_rewrite_person(&buf
, "\ncommitter ", opt
->mailmap
);
2794 /* Append "fake" message parts as needed */
2795 if (opt
->show_notes
) {
2797 strbuf_addstr(&buf
, message
);
2798 format_display_notes(commit
->object
.sha1
, &buf
, encoding
, 1);
2801 /* Find either in the original commit message, or in the temporary */
2803 retval
= grep_buffer(&opt
->grep_filter
, buf
.buf
, buf
.len
);
2805 retval
= grep_buffer(&opt
->grep_filter
,
2806 message
, strlen(message
));
2807 strbuf_release(&buf
);
2808 logmsg_free(message
, commit
);
2812 static inline int want_ancestry(struct rev_info
*revs
)
2814 return (revs
->rewrite_parents
|| revs
->children
.name
);
2817 enum commit_action
get_commit_action(struct rev_info
*revs
, struct commit
*commit
)
2819 if (commit
->object
.flags
& SHOWN
)
2820 return commit_ignore
;
2821 if (revs
->unpacked
&& has_sha1_pack(commit
->object
.sha1
))
2822 return commit_ignore
;
2825 if (commit
->object
.flags
& UNINTERESTING
)
2826 return commit_ignore
;
2827 if (revs
->min_age
!= -1 && (commit
->date
> revs
->min_age
))
2828 return commit_ignore
;
2829 if (revs
->min_parents
|| (revs
->max_parents
>= 0)) {
2830 int n
= commit_list_count(commit
->parents
);
2831 if ((n
< revs
->min_parents
) ||
2832 ((revs
->max_parents
>= 0) && (n
> revs
->max_parents
)))
2833 return commit_ignore
;
2835 if (!commit_match(commit
, revs
))
2836 return commit_ignore
;
2837 if (revs
->prune
&& revs
->dense
) {
2838 /* Commit without changes? */
2839 if (commit
->object
.flags
& TREESAME
) {
2841 struct commit_list
*p
;
2842 /* drop merges unless we want parenthood */
2843 if (!want_ancestry(revs
))
2844 return commit_ignore
;
2846 * If we want ancestry, then need to keep any merges
2847 * between relevant commits to tie together topology.
2848 * For consistency with TREESAME and simplification
2849 * use "relevant" here rather than just INTERESTING,
2850 * to treat bottom commit(s) as part of the topology.
2852 for (n
= 0, p
= commit
->parents
; p
; p
= p
->next
)
2853 if (relevant_commit(p
->item
))
2856 return commit_ignore
;
2862 enum commit_action
simplify_commit(struct rev_info
*revs
, struct commit
*commit
)
2864 enum commit_action action
= get_commit_action(revs
, commit
);
2866 if (action
== commit_show
&&
2868 revs
->prune
&& revs
->dense
&& want_ancestry(revs
)) {
2869 if (rewrite_parents(revs
, commit
, rewrite_one
) < 0)
2870 return commit_error
;
2875 static struct commit
*get_revision_1(struct rev_info
*revs
)
2881 struct commit_list
*entry
= revs
->commits
;
2882 struct commit
*commit
= entry
->item
;
2884 revs
->commits
= entry
->next
;
2887 if (revs
->reflog_info
) {
2888 fake_reflog_parent(revs
->reflog_info
, commit
);
2889 commit
->object
.flags
&= ~(ADDED
| SEEN
| SHOWN
);
2893 * If we haven't done the list limiting, we need to look at
2894 * the parents here. We also need to do the date-based limiting
2895 * that we'd otherwise have done in limit_list().
2897 if (!revs
->limited
) {
2898 if (revs
->max_age
!= -1 &&
2899 (commit
->date
< revs
->max_age
))
2901 if (add_parents_to_list(revs
, commit
, &revs
->commits
, NULL
) < 0)
2902 die("Failed to traverse parents of commit %s",
2903 sha1_to_hex(commit
->object
.sha1
));
2906 switch (simplify_commit(revs
, commit
)) {
2910 die("Failed to simplify parents of commit %s",
2911 sha1_to_hex(commit
->object
.sha1
));
2915 } while (revs
->commits
);
2920 * Return true for entries that have not yet been shown. (This is an
2921 * object_array_each_func_t.)
2923 static int entry_unshown(struct object_array_entry
*entry
, void *cb_data_unused
)
2925 return !(entry
->item
->flags
& SHOWN
);
2929 * If array is on the verge of a realloc, garbage-collect any entries
2930 * that have already been shown to try to free up some space.
2932 static void gc_boundary(struct object_array
*array
)
2934 if (array
->nr
== array
->alloc
)
2935 object_array_filter(array
, entry_unshown
, NULL
);
2938 static void create_boundary_commit_list(struct rev_info
*revs
)
2942 struct object_array
*array
= &revs
->boundary_commits
;
2943 struct object_array_entry
*objects
= array
->objects
;
2946 * If revs->commits is non-NULL at this point, an error occurred in
2947 * get_revision_1(). Ignore the error and continue printing the
2948 * boundary commits anyway. (This is what the code has always
2951 if (revs
->commits
) {
2952 free_commit_list(revs
->commits
);
2953 revs
->commits
= NULL
;
2957 * Put all of the actual boundary commits from revs->boundary_commits
2958 * into revs->commits
2960 for (i
= 0; i
< array
->nr
; i
++) {
2961 c
= (struct commit
*)(objects
[i
].item
);
2964 if (!(c
->object
.flags
& CHILD_SHOWN
))
2966 if (c
->object
.flags
& (SHOWN
| BOUNDARY
))
2968 c
->object
.flags
|= BOUNDARY
;
2969 commit_list_insert(c
, &revs
->commits
);
2973 * If revs->topo_order is set, sort the boundary commits
2974 * in topological order
2976 sort_in_topological_order(&revs
->commits
, revs
->sort_order
);
2979 static struct commit
*get_revision_internal(struct rev_info
*revs
)
2981 struct commit
*c
= NULL
;
2982 struct commit_list
*l
;
2984 if (revs
->boundary
== 2) {
2986 * All of the normal commits have already been returned,
2987 * and we are now returning boundary commits.
2988 * create_boundary_commit_list() has populated
2989 * revs->commits with the remaining commits to return.
2991 c
= pop_commit(&revs
->commits
);
2993 c
->object
.flags
|= SHOWN
;
2998 * If our max_count counter has reached zero, then we are done. We
2999 * don't simply return NULL because we still might need to show
3000 * boundary commits. But we want to avoid calling get_revision_1, which
3001 * might do a considerable amount of work finding the next commit only
3002 * for us to throw it away.
3004 * If it is non-zero, then either we don't have a max_count at all
3005 * (-1), or it is still counting, in which case we decrement.
3007 if (revs
->max_count
) {
3008 c
= get_revision_1(revs
);
3010 while (0 < revs
->skip_count
) {
3012 c
= get_revision_1(revs
);
3018 if (revs
->max_count
> 0)
3023 c
->object
.flags
|= SHOWN
;
3025 if (!revs
->boundary
) {
3031 * get_revision_1() runs out the commits, and
3032 * we are done computing the boundaries.
3033 * switch to boundary commits output mode.
3038 * Update revs->commits to contain the list of
3041 create_boundary_commit_list(revs
);
3043 return get_revision_internal(revs
);
3047 * boundary commits are the commits that are parents of the
3048 * ones we got from get_revision_1() but they themselves are
3049 * not returned from get_revision_1(). Before returning
3050 * 'c', we need to mark its parents that they could be boundaries.
3053 for (l
= c
->parents
; l
; l
= l
->next
) {
3055 p
= &(l
->item
->object
);
3056 if (p
->flags
& (CHILD_SHOWN
| SHOWN
))
3058 p
->flags
|= CHILD_SHOWN
;
3059 gc_boundary(&revs
->boundary_commits
);
3060 add_object_array(p
, NULL
, &revs
->boundary_commits
);
3066 struct commit
*get_revision(struct rev_info
*revs
)
3069 struct commit_list
*reversed
;
3071 if (revs
->reverse
) {
3073 while ((c
= get_revision_internal(revs
))) {
3074 commit_list_insert(c
, &reversed
);
3076 revs
->commits
= reversed
;
3078 revs
->reverse_output_stage
= 1;
3081 if (revs
->reverse_output_stage
)
3082 return pop_commit(&revs
->commits
);
3084 c
= get_revision_internal(revs
);
3085 if (c
&& revs
->graph
)
3086 graph_update(revs
->graph
, c
);
3090 char *get_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3092 if (commit
->object
.flags
& BOUNDARY
)
3094 else if (commit
->object
.flags
& UNINTERESTING
)
3096 else if (commit
->object
.flags
& PATCHSAME
)
3098 else if (!revs
|| revs
->left_right
) {
3099 if (commit
->object
.flags
& SYMMETRIC_LEFT
)
3103 } else if (revs
->graph
)
3105 else if (revs
->cherry_mark
)
3110 void put_revision_mark(const struct rev_info
*revs
, const struct commit
*commit
)
3112 char *mark
= get_revision_mark(revs
, commit
);
3115 fputs(mark
, stdout
);