4 #include "commit-graph.h"
10 #include "gpg-interface.h"
11 #include "mergesort.h"
12 #include "commit-slab.h"
13 #include "prio-queue.h"
14 #include "sha1-lookup.h"
15 #include "wt-status.h"
17 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
19 int save_commit_buffer = 1;
21 const char *commit_type = "commit";
23 struct commit *lookup_commit_reference_gently(const struct object_id *oid,
26 struct object *obj = deref_tag(parse_object(oid), NULL, 0);
30 return object_as_type(obj, OBJ_COMMIT, quiet);
33 struct commit *lookup_commit_reference(const struct object_id *oid)
35 return lookup_commit_reference_gently(oid, 0);
38 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
40 struct commit *c = lookup_commit_reference(oid);
42 die(_("could not parse %s"), ref_name);
43 if (oidcmp(oid, &c->object.oid)) {
44 warning(_("%s %s is not a commit!"),
45 ref_name, oid_to_hex(oid));
50 struct commit *lookup_commit(const struct object_id *oid)
52 struct object *obj = lookup_object(oid->hash);
54 return create_object(oid->hash, alloc_commit_node());
55 return object_as_type(obj, OBJ_COMMIT, 0);
58 struct commit *lookup_commit_reference_by_name(const char *name)
61 struct commit *commit;
63 if (get_oid_committish(name, &oid))
65 commit = lookup_commit_reference(&oid);
66 if (parse_commit(commit))
71 static timestamp_t parse_commit_date(const char *buf, const char *tail)
77 if (memcmp(buf, "author", 6))
79 while (buf < tail && *buf++ != '\n')
83 if (memcmp(buf, "committer", 9))
85 while (buf < tail && *buf++ != '>')
90 while (buf < tail && *buf++ != '\n')
94 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
95 return parse_timestamp(dateptr, NULL, 10);
98 static struct commit_graft **commit_graft;
99 static int commit_graft_alloc, commit_graft_nr;
101 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
103 struct commit_graft **commit_graft_table = table;
104 return commit_graft_table[index]->oid.hash;
107 static int commit_graft_pos(const unsigned char *sha1)
109 return sha1_pos(sha1, commit_graft, commit_graft_nr,
110 commit_graft_sha1_access);
113 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
115 int pos = commit_graft_pos(graft->oid.hash);
121 free(commit_graft[pos]);
122 commit_graft[pos] = graft;
127 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
129 if (pos < commit_graft_nr)
130 MOVE_ARRAY(commit_graft + pos + 1, commit_graft + pos,
131 commit_graft_nr - pos - 1);
132 commit_graft[pos] = graft;
136 struct commit_graft *read_graft_line(struct strbuf *line)
138 /* The format is just "Commit Parent1 Parent2 ...\n" */
140 const char *tail = NULL;
141 struct commit_graft *graft = NULL;
142 struct object_id dummy_oid, *oid;
145 if (!line->len || line->buf[0] == '#')
148 * phase 0 verifies line, counts hashes in line and allocates graft
149 * phase 1 fills graft
151 for (phase = 0; phase < 2; phase++) {
152 oid = graft ? &graft->oid : &dummy_oid;
153 if (parse_oid_hex(line->buf, oid, &tail))
155 for (i = 0; *tail != '\0'; i++) {
156 oid = graft ? &graft->parent[i] : &dummy_oid;
157 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
161 graft = xmalloc(st_add(sizeof(*graft),
162 st_mult(sizeof(struct object_id), i)));
163 graft->nr_parent = i;
169 error("bad graft data: %s", line->buf);
174 static int read_graft_file(const char *graft_file)
176 FILE *fp = fopen_or_warn(graft_file, "r");
177 struct strbuf buf = STRBUF_INIT;
180 while (!strbuf_getwholeline(&buf, fp, '\n')) {
181 /* The format is just "Commit Parent1 Parent2 ...\n" */
182 struct commit_graft *graft = read_graft_line(&buf);
185 if (register_commit_graft(graft, 1))
186 error("duplicate graft data: %s", buf.buf);
189 strbuf_release(&buf);
193 static void prepare_commit_graft(void)
195 static int commit_graft_prepared;
198 if (commit_graft_prepared)
200 graft_file = get_graft_file();
201 read_graft_file(graft_file);
202 /* make sure shallows are read */
203 is_repository_shallow();
204 commit_graft_prepared = 1;
207 struct commit_graft *lookup_commit_graft(const struct object_id *oid)
210 prepare_commit_graft();
211 pos = commit_graft_pos(oid->hash);
214 return commit_graft[pos];
217 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
220 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
221 ret = fn(commit_graft[i], cb_data);
225 int unregister_shallow(const struct object_id *oid)
227 int pos = commit_graft_pos(oid->hash);
230 if (pos + 1 < commit_graft_nr)
231 MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1,
232 commit_graft_nr - pos - 1);
237 struct commit_buffer {
241 define_commit_slab(buffer_slab, struct commit_buffer);
242 static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
244 void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
246 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
251 const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
253 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
264 const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
266 const void *ret = get_cached_commit_buffer(commit, sizep);
268 enum object_type type;
270 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
272 die("cannot read commit object %s",
273 oid_to_hex(&commit->object.oid));
274 if (type != OBJ_COMMIT)
275 die("expected commit for %s, got %s",
276 oid_to_hex(&commit->object.oid), type_name(type));
283 void unuse_commit_buffer(const struct commit *commit, const void *buffer)
285 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
286 if (!(v && v->buffer == buffer))
287 free((void *)buffer);
290 void free_commit_buffer(struct commit *commit)
292 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
294 FREE_AND_NULL(v->buffer);
299 struct tree *get_commit_tree(const struct commit *commit)
301 if (commit->maybe_tree || !commit->object.parsed)
302 return commit->maybe_tree;
304 if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
305 BUG("commit has NULL tree, but was not loaded from commit-graph");
307 return get_commit_tree_in_graph(commit);
310 struct object_id *get_commit_tree_oid(const struct commit *commit)
312 return &get_commit_tree(commit)->object.oid;
315 const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
317 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
334 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph)
336 const char *tail = buffer;
337 const char *bufptr = buffer;
338 struct object_id parent;
339 struct commit_list **pptr;
340 struct commit_graft *graft;
341 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
342 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
344 if (item->object.parsed)
346 item->object.parsed = 1;
348 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
349 bufptr[tree_entry_len] != '\n')
350 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
351 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
352 return error("bad tree pointer in commit %s",
353 oid_to_hex(&item->object.oid));
354 item->maybe_tree = lookup_tree(&parent);
355 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
356 pptr = &item->parents;
358 graft = lookup_commit_graft(&item->object.oid);
359 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
360 struct commit *new_parent;
362 if (tail <= bufptr + parent_entry_len + 1 ||
363 get_sha1_hex(bufptr + 7, parent.hash) ||
364 bufptr[parent_entry_len] != '\n')
365 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
366 bufptr += parent_entry_len + 1;
368 * The clone is shallow if nr_parent < 0, and we must
369 * not traverse its real parents even when we unhide them.
371 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
373 new_parent = lookup_commit(&parent);
375 pptr = &commit_list_insert(new_parent, pptr)->next;
379 struct commit *new_parent;
380 for (i = 0; i < graft->nr_parent; i++) {
381 new_parent = lookup_commit(&graft->parent[i]);
384 pptr = &commit_list_insert(new_parent, pptr)->next;
387 item->date = parse_commit_date(bufptr, tail);
390 load_commit_graph_info(item);
395 int parse_commit_gently(struct commit *item, int quiet_on_missing)
397 enum object_type type;
404 if (item->object.parsed)
406 if (parse_commit_in_graph(item))
408 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
410 return quiet_on_missing ? -1 :
411 error("Could not read %s",
412 oid_to_hex(&item->object.oid));
413 if (type != OBJ_COMMIT) {
415 return error("Object %s not a commit",
416 oid_to_hex(&item->object.oid));
418 ret = parse_commit_buffer(item, buffer, size, 0);
419 if (save_commit_buffer && !ret) {
420 set_commit_buffer(item, buffer, size);
427 void parse_commit_or_die(struct commit *item)
429 if (parse_commit(item))
430 die("unable to parse commit %s",
431 item ? oid_to_hex(&item->object.oid) : "(null)");
434 int find_commit_subject(const char *commit_buffer, const char **subject)
437 const char *p = commit_buffer;
439 while (*p && (*p != '\n' || p[1] != '\n'))
442 p = skip_blank_lines(p + 2);
443 eol = strchrnul(p, '\n');
452 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
454 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
455 new_list->item = item;
456 new_list->next = *list_p;
461 unsigned commit_list_count(const struct commit_list *l)
464 for (; l; l = l->next )
469 struct commit_list *copy_commit_list(struct commit_list *list)
471 struct commit_list *head = NULL;
472 struct commit_list **pp = &head;
474 pp = commit_list_append(list->item, pp);
480 void free_commit_list(struct commit_list *list)
486 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
488 struct commit_list **pp = list;
489 struct commit_list *p;
490 while ((p = *pp) != NULL) {
491 if (p->item->date < item->date) {
496 return commit_list_insert(item, pp);
499 static int commit_list_compare_by_date(const void *a, const void *b)
501 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
502 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
510 static void *commit_list_get_next(const void *a)
512 return ((const struct commit_list *)a)->next;
515 static void commit_list_set_next(void *a, void *next)
517 ((struct commit_list *)a)->next = next;
520 void commit_list_sort_by_date(struct commit_list **list)
522 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
523 commit_list_compare_by_date);
526 struct commit *pop_most_recent_commit(struct commit_list **list,
529 struct commit *ret = pop_commit(list);
530 struct commit_list *parents = ret->parents;
533 struct commit *commit = parents->item;
534 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
535 commit->object.flags |= mark;
536 commit_list_insert_by_date(commit, list);
538 parents = parents->next;
543 static void clear_commit_marks_1(struct commit_list **plist,
544 struct commit *commit, unsigned int mark)
547 struct commit_list *parents;
549 if (!(mark & commit->object.flags))
552 commit->object.flags &= ~mark;
554 parents = commit->parents;
558 while ((parents = parents->next))
559 commit_list_insert(parents->item, plist);
561 commit = commit->parents->item;
565 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
567 struct commit_list *list = NULL;
570 clear_commit_marks_1(&list, *commit, mark);
574 clear_commit_marks_1(&list, pop_commit(&list), mark);
577 void clear_commit_marks(struct commit *commit, unsigned int mark)
579 clear_commit_marks_many(1, &commit, mark);
582 struct commit *pop_commit(struct commit_list **stack)
584 struct commit_list *top = *stack;
585 struct commit *item = top ? top->item : NULL;
595 * Topological sort support
598 /* count number of children that have not been emitted */
599 define_commit_slab(indegree_slab, int);
601 /* record author-date for each commit object */
602 define_commit_slab(author_date_slab, unsigned long);
604 static void record_author_date(struct author_date_slab *author_date,
605 struct commit *commit)
607 const char *buffer = get_commit_buffer(commit, NULL);
608 struct ident_split ident;
609 const char *ident_line;
614 ident_line = find_commit_header(buffer, "author", &ident_len);
616 goto fail_exit; /* no author line */
617 if (split_ident_line(&ident, ident_line, ident_len) ||
618 !ident.date_begin || !ident.date_end)
619 goto fail_exit; /* malformed "author" line */
621 date = parse_timestamp(ident.date_begin, &date_end, 10);
622 if (date_end != ident.date_end)
623 goto fail_exit; /* malformed date */
624 *(author_date_slab_at(author_date, commit)) = date;
627 unuse_commit_buffer(commit, buffer);
630 static int compare_commits_by_author_date(const void *a_, const void *b_,
633 const struct commit *a = a_, *b = b_;
634 struct author_date_slab *author_date = cb_data;
635 timestamp_t a_date = *(author_date_slab_at(author_date, a));
636 timestamp_t b_date = *(author_date_slab_at(author_date, b));
638 /* newer commits with larger date first */
641 else if (a_date > b_date)
646 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
648 const struct commit *a = a_, *b = b_;
650 /* newer commits first */
651 if (a->generation < b->generation)
653 else if (a->generation > b->generation)
656 /* use date as a heuristic when generations are equal */
657 if (a->date < b->date)
659 else if (a->date > b->date)
664 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
666 const struct commit *a = a_, *b = b_;
667 /* newer commits with larger date first */
668 if (a->date < b->date)
670 else if (a->date > b->date)
676 * Performs an in-place topological sort on the list supplied.
678 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
680 struct commit_list *next, *orig = *list;
681 struct commit_list **pptr;
682 struct indegree_slab indegree;
683 struct prio_queue queue;
684 struct commit *commit;
685 struct author_date_slab author_date;
691 init_indegree_slab(&indegree);
692 memset(&queue, '\0', sizeof(queue));
694 switch (sort_order) {
695 default: /* REV_SORT_IN_GRAPH_ORDER */
696 queue.compare = NULL;
698 case REV_SORT_BY_COMMIT_DATE:
699 queue.compare = compare_commits_by_commit_date;
701 case REV_SORT_BY_AUTHOR_DATE:
702 init_author_date_slab(&author_date);
703 queue.compare = compare_commits_by_author_date;
704 queue.cb_data = &author_date;
708 /* Mark them and clear the indegree */
709 for (next = orig; next; next = next->next) {
710 struct commit *commit = next->item;
711 *(indegree_slab_at(&indegree, commit)) = 1;
712 /* also record the author dates, if needed */
713 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
714 record_author_date(&author_date, commit);
717 /* update the indegree */
718 for (next = orig; next; next = next->next) {
719 struct commit_list *parents = next->item->parents;
721 struct commit *parent = parents->item;
722 int *pi = indegree_slab_at(&indegree, parent);
726 parents = parents->next;
733 * tips are nodes not reachable from any other node in the list
735 * the tips serve as a starting set for the work queue.
737 for (next = orig; next; next = next->next) {
738 struct commit *commit = next->item;
740 if (*(indegree_slab_at(&indegree, commit)) == 1)
741 prio_queue_put(&queue, commit);
745 * This is unfortunate; the initial tips need to be shown
746 * in the order given from the revision traversal machinery.
748 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
749 prio_queue_reverse(&queue);
751 /* We no longer need the commit list */
752 free_commit_list(orig);
756 while ((commit = prio_queue_get(&queue)) != NULL) {
757 struct commit_list *parents;
759 for (parents = commit->parents; parents ; parents = parents->next) {
760 struct commit *parent = parents->item;
761 int *pi = indegree_slab_at(&indegree, parent);
767 * parents are only enqueued for emission
768 * when all their children have been emitted thereby
769 * guaranteeing topological order.
772 prio_queue_put(&queue, parent);
775 * all children of commit have already been
776 * emitted. we can emit it now.
778 *(indegree_slab_at(&indegree, commit)) = 0;
780 pptr = &commit_list_insert(commit, pptr)->next;
783 clear_indegree_slab(&indegree);
784 clear_prio_queue(&queue);
785 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
786 clear_author_date_slab(&author_date);
789 /* merge-base stuff */
791 /* Remember to update object flag allocation in object.h */
792 #define PARENT1 (1u<<16)
793 #define PARENT2 (1u<<17)
794 #define STALE (1u<<18)
795 #define RESULT (1u<<19)
797 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
799 static int queue_has_nonstale(struct prio_queue *queue)
802 for (i = 0; i < queue->nr; i++) {
803 struct commit *commit = queue->array[i].data;
804 if (!(commit->object.flags & STALE))
810 /* all input commits in one and twos[] must have been parsed! */
811 static struct commit_list *paint_down_to_common(struct commit *one, int n,
812 struct commit **twos,
815 struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
816 struct commit_list *result = NULL;
818 uint32_t last_gen = GENERATION_NUMBER_INFINITY;
821 queue.compare = compare_commits_by_commit_date;
823 one->object.flags |= PARENT1;
825 commit_list_append(one, &result);
828 prio_queue_put(&queue, one);
830 for (i = 0; i < n; i++) {
831 twos[i]->object.flags |= PARENT2;
832 prio_queue_put(&queue, twos[i]);
835 while (queue_has_nonstale(&queue)) {
836 struct commit *commit = prio_queue_get(&queue);
837 struct commit_list *parents;
840 if (min_generation && commit->generation > last_gen)
841 BUG("bad generation skip %8x > %8x at %s",
842 commit->generation, last_gen,
843 oid_to_hex(&commit->object.oid));
844 last_gen = commit->generation;
846 if (commit->generation < min_generation)
849 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
850 if (flags == (PARENT1 | PARENT2)) {
851 if (!(commit->object.flags & RESULT)) {
852 commit->object.flags |= RESULT;
853 commit_list_insert_by_date(commit, &result);
855 /* Mark parents of a found merge stale */
858 parents = commit->parents;
860 struct commit *p = parents->item;
861 parents = parents->next;
862 if ((p->object.flags & flags) == flags)
866 p->object.flags |= flags;
867 prio_queue_put(&queue, p);
871 clear_prio_queue(&queue);
875 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
877 struct commit_list *list = NULL;
878 struct commit_list *result = NULL;
881 for (i = 0; i < n; i++) {
884 * We do not mark this even with RESULT so we do not
885 * have to clean it up.
887 return commit_list_insert(one, &result);
890 if (parse_commit(one))
892 for (i = 0; i < n; i++) {
893 if (parse_commit(twos[i]))
897 list = paint_down_to_common(one, n, twos, 0);
900 struct commit *commit = pop_commit(&list);
901 if (!(commit->object.flags & STALE))
902 commit_list_insert_by_date(commit, &result);
907 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
909 struct commit_list *i, *j, *k, *ret = NULL;
914 commit_list_insert(in->item, &ret);
916 for (i = in->next; i; i = i->next) {
917 struct commit_list *new_commits = NULL, *end = NULL;
919 for (j = ret; j; j = j->next) {
920 struct commit_list *bases;
921 bases = get_merge_bases(i->item, j->item);
926 for (k = bases; k; k = k->next)
934 static int remove_redundant(struct commit **array, int cnt)
937 * Some commit in the array may be an ancestor of
938 * another commit. Move such commit to the end of
939 * the array, and return the number of commits that
940 * are independent from each other.
942 struct commit **work;
943 unsigned char *redundant;
947 work = xcalloc(cnt, sizeof(*work));
948 redundant = xcalloc(cnt, 1);
949 ALLOC_ARRAY(filled_index, cnt - 1);
951 for (i = 0; i < cnt; i++)
952 parse_commit(array[i]);
953 for (i = 0; i < cnt; i++) {
954 struct commit_list *common;
955 uint32_t min_generation = array[i]->generation;
959 for (j = filled = 0; j < cnt; j++) {
960 if (i == j || redundant[j])
962 filled_index[filled] = j;
963 work[filled++] = array[j];
965 if (array[j]->generation < min_generation)
966 min_generation = array[j]->generation;
968 common = paint_down_to_common(array[i], filled, work,
970 if (array[i]->object.flags & PARENT2)
972 for (j = 0; j < filled; j++)
973 if (work[j]->object.flags & PARENT1)
974 redundant[filled_index[j]] = 1;
975 clear_commit_marks(array[i], all_flags);
976 clear_commit_marks_many(filled, work, all_flags);
977 free_commit_list(common);
980 /* Now collect the result */
981 COPY_ARRAY(work, array, cnt);
982 for (i = filled = 0; i < cnt; i++)
984 array[filled++] = work[i];
985 for (j = filled, i = 0; i < cnt; i++)
987 array[j++] = work[i];
994 static struct commit_list *get_merge_bases_many_0(struct commit *one,
996 struct commit **twos,
999 struct commit_list *list;
1000 struct commit **rslt;
1001 struct commit_list *result;
1004 result = merge_bases_many(one, n, twos);
1005 for (i = 0; i < n; i++) {
1009 if (!result || !result->next) {
1011 clear_commit_marks(one, all_flags);
1012 clear_commit_marks_many(n, twos, all_flags);
1017 /* There are more than one */
1018 cnt = commit_list_count(result);
1019 rslt = xcalloc(cnt, sizeof(*rslt));
1020 for (list = result, i = 0; list; list = list->next)
1021 rslt[i++] = list->item;
1022 free_commit_list(result);
1024 clear_commit_marks(one, all_flags);
1025 clear_commit_marks_many(n, twos, all_flags);
1027 cnt = remove_redundant(rslt, cnt);
1029 for (i = 0; i < cnt; i++)
1030 commit_list_insert_by_date(rslt[i], &result);
1035 struct commit_list *get_merge_bases_many(struct commit *one,
1037 struct commit **twos)
1039 return get_merge_bases_many_0(one, n, twos, 1);
1042 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
1044 struct commit **twos)
1046 return get_merge_bases_many_0(one, n, twos, 0);
1049 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1051 return get_merge_bases_many_0(one, 1, &two, 1);
1055 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1057 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1061 while (with_commit) {
1062 struct commit *other;
1064 other = with_commit->item;
1065 with_commit = with_commit->next;
1066 if (in_merge_bases(other, commit))
1073 * Is "commit" an ancestor of one of the "references"?
1075 int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1077 struct commit_list *bases;
1079 uint32_t min_generation = GENERATION_NUMBER_INFINITY;
1081 if (parse_commit(commit))
1083 for (i = 0; i < nr_reference; i++) {
1084 if (parse_commit(reference[i]))
1086 if (reference[i]->generation < min_generation)
1087 min_generation = reference[i]->generation;
1090 if (commit->generation > min_generation)
1093 bases = paint_down_to_common(commit, nr_reference, reference, commit->generation);
1094 if (commit->object.flags & PARENT2)
1096 clear_commit_marks(commit, all_flags);
1097 clear_commit_marks_many(nr_reference, reference, all_flags);
1098 free_commit_list(bases);
1103 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1105 int in_merge_bases(struct commit *commit, struct commit *reference)
1107 return in_merge_bases_many(commit, 1, &reference);
1110 struct commit_list *reduce_heads(struct commit_list *heads)
1112 struct commit_list *p;
1113 struct commit_list *result = NULL, **tail = &result;
1114 struct commit **array;
1121 for (p = heads; p; p = p->next)
1122 p->item->object.flags &= ~STALE;
1123 for (p = heads, num_head = 0; p; p = p->next) {
1124 if (p->item->object.flags & STALE)
1126 p->item->object.flags |= STALE;
1129 array = xcalloc(num_head, sizeof(*array));
1130 for (p = heads, i = 0; p; p = p->next) {
1131 if (p->item->object.flags & STALE) {
1132 array[i++] = p->item;
1133 p->item->object.flags &= ~STALE;
1136 num_head = remove_redundant(array, num_head);
1137 for (i = 0; i < num_head; i++)
1138 tail = &commit_list_insert(array[i], tail)->next;
1143 void reduce_heads_replace(struct commit_list **heads)
1145 struct commit_list *result = reduce_heads(*heads);
1146 free_commit_list(*heads);
1150 static const char gpg_sig_header[] = "gpgsig";
1151 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1153 static int do_sign_commit(struct strbuf *buf, const char *keyid)
1155 struct strbuf sig = STRBUF_INIT;
1156 int inspos, copypos;
1159 /* find the end of the header */
1160 eoh = strstr(buf->buf, "\n\n");
1164 inspos = eoh - buf->buf + 1;
1166 if (!keyid || !*keyid)
1167 keyid = get_signing_key();
1168 if (sign_buffer(buf, &sig, keyid)) {
1169 strbuf_release(&sig);
1173 for (copypos = 0; sig.buf[copypos]; ) {
1174 const char *bol = sig.buf + copypos;
1175 const char *eol = strchrnul(bol, '\n');
1176 int len = (eol - bol) + !!*eol;
1179 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1180 inspos += gpg_sig_header_len;
1182 strbuf_insert(buf, inspos++, " ", 1);
1183 strbuf_insert(buf, inspos, bol, len);
1187 strbuf_release(&sig);
1191 int parse_signed_commit(const struct commit *commit,
1192 struct strbuf *payload, struct strbuf *signature)
1196 const char *buffer = get_commit_buffer(commit, &size);
1197 int in_signature, saw_signature = -1;
1198 const char *line, *tail;
1201 tail = buffer + size;
1204 while (line < tail) {
1205 const char *sig = NULL;
1206 const char *next = memchr(line, '\n', tail - line);
1208 next = next ? next + 1 : tail;
1209 if (in_signature && line[0] == ' ')
1211 else if (starts_with(line, gpg_sig_header) &&
1212 line[gpg_sig_header_len] == ' ')
1213 sig = line + gpg_sig_header_len + 1;
1215 strbuf_add(signature, sig, next - sig);
1220 /* dump the whole remainder of the buffer */
1222 strbuf_add(payload, line, next - line);
1227 unuse_commit_buffer(commit, buffer);
1228 return saw_signature;
1231 int remove_signature(struct strbuf *buf)
1233 const char *line = buf->buf;
1234 const char *tail = buf->buf + buf->len;
1235 int in_signature = 0;
1236 const char *sig_start = NULL;
1237 const char *sig_end = NULL;
1239 while (line < tail) {
1240 const char *next = memchr(line, '\n', tail - line);
1241 next = next ? next + 1 : tail;
1243 if (in_signature && line[0] == ' ')
1245 else if (starts_with(line, gpg_sig_header) &&
1246 line[gpg_sig_header_len] == ' ') {
1252 /* dump the whole remainder of the buffer */
1260 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1262 return sig_start != NULL;
1265 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1267 struct merge_remote_desc *desc;
1268 struct commit_extra_header *mergetag;
1270 unsigned long size, len;
1271 enum object_type type;
1273 desc = merge_remote_util(parent);
1274 if (!desc || !desc->obj)
1276 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
1277 if (!buf || type != OBJ_TAG)
1279 len = parse_signature(buf, size);
1283 * We could verify this signature and either omit the tag when
1284 * it does not validate, but the integrator may not have the
1285 * public key of the signer of the tag he is merging, while a
1286 * later auditor may have it while auditing, so let's not run
1287 * verify-signed-buffer here for now...
1289 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1290 * warn("warning: signed tag unverified.");
1292 mergetag = xcalloc(1, sizeof(*mergetag));
1293 mergetag->key = xstrdup("mergetag");
1294 mergetag->value = buf;
1295 mergetag->len = size;
1298 *tail = &mergetag->next;
1305 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1307 struct strbuf payload = STRBUF_INIT;
1308 struct strbuf signature = STRBUF_INIT;
1313 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1315 ret = check_signature(payload.buf, payload.len, signature.buf,
1316 signature.len, sigc);
1319 strbuf_release(&payload);
1320 strbuf_release(&signature);
1327 void append_merge_tag_headers(struct commit_list *parents,
1328 struct commit_extra_header ***tail)
1331 struct commit *parent = parents->item;
1332 handle_signed_tag(parent, tail);
1333 parents = parents->next;
1337 static void add_extra_header(struct strbuf *buffer,
1338 struct commit_extra_header *extra)
1340 strbuf_addstr(buffer, extra->key);
1342 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1344 strbuf_addch(buffer, '\n');
1347 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1348 const char **exclude)
1350 struct commit_extra_header *extra = NULL;
1352 const char *buffer = get_commit_buffer(commit, &size);
1353 extra = read_commit_extra_header_lines(buffer, size, exclude);
1354 unuse_commit_buffer(commit, buffer);
1358 void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1360 struct commit_extra_header *extra, *to_free;
1362 to_free = read_commit_extra_headers(commit, NULL);
1363 for (extra = to_free; extra; extra = extra->next) {
1364 if (strcmp(extra->key, "mergetag"))
1365 continue; /* not a merge tag */
1366 fn(commit, extra, data);
1368 free_commit_extra_headers(to_free);
1371 static inline int standard_header_field(const char *field, size_t len)
1373 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1374 (len == 6 && !memcmp(field, "parent", 6)) ||
1375 (len == 6 && !memcmp(field, "author", 6)) ||
1376 (len == 9 && !memcmp(field, "committer", 9)) ||
1377 (len == 8 && !memcmp(field, "encoding", 8)));
1380 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1386 size_t xlen = strlen(*exclude);
1387 if (len == xlen && !memcmp(field, *exclude, xlen))
1394 static struct commit_extra_header *read_commit_extra_header_lines(
1395 const char *buffer, size_t size,
1396 const char **exclude)
1398 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1399 const char *line, *next, *eof, *eob;
1400 struct strbuf buf = STRBUF_INIT;
1402 for (line = buffer, eob = line + size;
1403 line < eob && *line != '\n';
1405 next = memchr(line, '\n', eob - line);
1406 next = next ? next + 1 : eob;
1410 strbuf_add(&buf, line + 1, next - (line + 1));
1414 it->value = strbuf_detach(&buf, &it->len);
1418 eof = memchr(line, ' ', next - line);
1421 else if (standard_header_field(line, eof - line) ||
1422 excluded_header_field(line, eof - line, exclude))
1425 it = xcalloc(1, sizeof(*it));
1426 it->key = xmemdupz(line, eof-line);
1430 strbuf_add(&buf, eof + 1, next - (eof + 1));
1433 it->value = strbuf_detach(&buf, &it->len);
1437 void free_commit_extra_headers(struct commit_extra_header *extra)
1440 struct commit_extra_header *next = extra->next;
1448 int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1449 struct commit_list *parents, struct object_id *ret,
1450 const char *author, const char *sign_commit)
1452 struct commit_extra_header *extra = NULL, **tail = &extra;
1455 append_merge_tag_headers(parents, &tail);
1456 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1457 author, sign_commit, extra);
1458 free_commit_extra_headers(extra);
1462 static int find_invalid_utf8(const char *buf, int len)
1465 static const unsigned int max_codepoint[] = {
1466 0x7f, 0x7ff, 0xffff, 0x10ffff
1470 unsigned char c = *buf++;
1471 int bytes, bad_offset;
1472 unsigned int codepoint;
1473 unsigned int min_val, max_val;
1478 /* Simple US-ASCII? No worries. */
1482 bad_offset = offset-1;
1485 * Count how many more high bits set: that's how
1486 * many more bytes this sequence should have.
1495 * Must be between 1 and 3 more bytes. Longer sequences result in
1496 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1498 if (bytes < 1 || 3 < bytes)
1501 /* Do we *have* that many bytes? */
1506 * Place the encoded bits at the bottom of the value and compute the
1509 codepoint = (c & 0x7f) >> bytes;
1510 min_val = max_codepoint[bytes-1] + 1;
1511 max_val = max_codepoint[bytes];
1516 /* And verify that they are good continuation bytes */
1519 codepoint |= *buf & 0x3f;
1520 if ((*buf++ & 0xc0) != 0x80)
1524 /* Reject codepoints that are out of range for the sequence length. */
1525 if (codepoint < min_val || codepoint > max_val)
1527 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1528 if ((codepoint & 0x1ff800) == 0xd800)
1530 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1531 if ((codepoint & 0xfffe) == 0xfffe)
1533 /* So are anything in the range U+FDD0..U+FDEF. */
1534 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1541 * This verifies that the buffer is in proper utf8 format.
1543 * If it isn't, it assumes any non-utf8 characters are Latin1,
1544 * and does the conversion.
1546 static int verify_utf8(struct strbuf *buf)
1554 unsigned char replace[2];
1556 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1562 strbuf_remove(buf, pos, 1);
1564 /* We know 'c' must be in the range 128-255 */
1565 replace[0] = 0xc0 + (c >> 6);
1566 replace[1] = 0x80 + (c & 0x3f);
1567 strbuf_insert(buf, pos, replace, 2);
1572 static const char commit_utf8_warn[] =
1573 N_("Warning: commit message did not conform to UTF-8.\n"
1574 "You may want to amend it after fixing the message, or set the config\n"
1575 "variable i18n.commitencoding to the encoding your project uses.\n");
1577 int commit_tree_extended(const char *msg, size_t msg_len,
1578 const struct object_id *tree,
1579 struct commit_list *parents, struct object_id *ret,
1580 const char *author, const char *sign_commit,
1581 struct commit_extra_header *extra)
1584 int encoding_is_utf8;
1585 struct strbuf buffer;
1587 assert_sha1_type(tree->hash, OBJ_TREE);
1589 if (memchr(msg, '\0', msg_len))
1590 return error("a NUL byte in commit log message not allowed.");
1592 /* Not having i18n.commitencoding is the same as having utf-8 */
1593 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1595 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1596 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
1599 * NOTE! This ordering means that the same exact tree merged with a
1600 * different order of parents will be a _different_ changeset even
1601 * if everything else stays the same.
1604 struct commit *parent = pop_commit(&parents);
1605 strbuf_addf(&buffer, "parent %s\n",
1606 oid_to_hex(&parent->object.oid));
1609 /* Person/date information */
1611 author = git_author_info(IDENT_STRICT);
1612 strbuf_addf(&buffer, "author %s\n", author);
1613 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1614 if (!encoding_is_utf8)
1615 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1618 add_extra_header(&buffer, extra);
1619 extra = extra->next;
1621 strbuf_addch(&buffer, '\n');
1623 /* And add the comment */
1624 strbuf_add(&buffer, msg, msg_len);
1626 /* And check the encoding */
1627 if (encoding_is_utf8 && !verify_utf8(&buffer))
1628 fprintf(stderr, _(commit_utf8_warn));
1630 if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
1635 result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
1637 strbuf_release(&buffer);
1641 void set_merge_remote_desc(struct commit *commit,
1642 const char *name, struct object *obj)
1644 struct merge_remote_desc *desc;
1645 FLEX_ALLOC_STR(desc, name, name);
1647 commit->util = desc;
1650 struct commit *get_merge_parent(const char *name)
1653 struct commit *commit;
1654 struct object_id oid;
1655 if (get_oid(name, &oid))
1657 obj = parse_object(&oid);
1658 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1659 if (commit && !commit->util)
1660 set_merge_remote_desc(commit, name, obj);
1665 * Append a commit to the end of the commit_list.
1667 * next starts by pointing to the variable that holds the head of an
1668 * empty commit_list, and is updated to point to the "next" field of
1669 * the last item on the list as new commits are appended.
1673 * struct commit_list *list;
1674 * struct commit_list **next = &list;
1676 * next = commit_list_append(c1, next);
1677 * next = commit_list_append(c2, next);
1678 * assert(commit_list_count(list) == 2);
1681 struct commit_list **commit_list_append(struct commit *commit,
1682 struct commit_list **next)
1684 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1685 new_commit->item = commit;
1687 new_commit->next = NULL;
1688 return &new_commit->next;
1691 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1693 int key_len = strlen(key);
1694 const char *line = msg;
1697 const char *eol = strchrnul(line, '\n');
1702 if (eol - line > key_len &&
1703 !strncmp(line, key, key_len) &&
1704 line[key_len] == ' ') {
1705 *out_len = eol - line - key_len - 1;
1706 return line + key_len + 1;
1708 line = *eol ? eol + 1 : NULL;
1714 * Inspect the given string and determine the true "end" of the log message, in
1715 * order to find where to put a new Signed-off-by: line. Ignored are
1716 * trailing comment lines and blank lines. To support "git commit -s
1717 * --amend" on an existing commit, we also ignore "Conflicts:". To
1718 * support "git commit -v", we truncate at cut lines.
1720 * Returns the number of bytes from the tail to ignore, to be fed as
1721 * the second parameter to append_signoff().
1723 int ignore_non_trailer(const char *buf, size_t len)
1727 int in_old_conflicts_block = 0;
1728 size_t cutoff = wt_status_locate_end(buf, len);
1730 while (bol < cutoff) {
1731 const char *next_line = memchr(buf + bol, '\n', len - bol);
1734 next_line = buf + len;
1738 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1739 /* is this the first of the run of comments? */
1742 /* otherwise, it is just continuing */
1743 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1744 in_old_conflicts_block = 1;
1747 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1748 ; /* a pathname in the conflicts block */
1750 /* the previous was not trailing comment */
1752 in_old_conflicts_block = 0;
1754 bol = next_line - buf;
1756 return boc ? len - boc : len - cutoff;