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_object_file(&commit->object.oid, &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)
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);
392 int parse_commit_gently(struct commit *item, int quiet_on_missing)
394 enum object_type type;
401 if (item->object.parsed)
403 if (parse_commit_in_graph(item))
405 buffer = read_object_file(&item->object.oid, &type, &size);
407 return quiet_on_missing ? -1 :
408 error("Could not read %s",
409 oid_to_hex(&item->object.oid));
410 if (type != OBJ_COMMIT) {
412 return error("Object %s not a commit",
413 oid_to_hex(&item->object.oid));
415 ret = parse_commit_buffer(item, buffer, size);
416 if (save_commit_buffer && !ret) {
417 set_commit_buffer(item, buffer, size);
424 void parse_commit_or_die(struct commit *item)
426 if (parse_commit(item))
427 die("unable to parse commit %s",
428 item ? oid_to_hex(&item->object.oid) : "(null)");
431 int find_commit_subject(const char *commit_buffer, const char **subject)
434 const char *p = commit_buffer;
436 while (*p && (*p != '\n' || p[1] != '\n'))
439 p = skip_blank_lines(p + 2);
440 eol = strchrnul(p, '\n');
449 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
451 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
452 new_list->item = item;
453 new_list->next = *list_p;
458 unsigned commit_list_count(const struct commit_list *l)
461 for (; l; l = l->next )
466 struct commit_list *copy_commit_list(struct commit_list *list)
468 struct commit_list *head = NULL;
469 struct commit_list **pp = &head;
471 pp = commit_list_append(list->item, pp);
477 void free_commit_list(struct commit_list *list)
483 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
485 struct commit_list **pp = list;
486 struct commit_list *p;
487 while ((p = *pp) != NULL) {
488 if (p->item->date < item->date) {
493 return commit_list_insert(item, pp);
496 static int commit_list_compare_by_date(const void *a, const void *b)
498 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
499 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
507 static void *commit_list_get_next(const void *a)
509 return ((const struct commit_list *)a)->next;
512 static void commit_list_set_next(void *a, void *next)
514 ((struct commit_list *)a)->next = next;
517 void commit_list_sort_by_date(struct commit_list **list)
519 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
520 commit_list_compare_by_date);
523 struct commit *pop_most_recent_commit(struct commit_list **list,
526 struct commit *ret = pop_commit(list);
527 struct commit_list *parents = ret->parents;
530 struct commit *commit = parents->item;
531 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
532 commit->object.flags |= mark;
533 commit_list_insert_by_date(commit, list);
535 parents = parents->next;
540 static void clear_commit_marks_1(struct commit_list **plist,
541 struct commit *commit, unsigned int mark)
544 struct commit_list *parents;
546 if (!(mark & commit->object.flags))
549 commit->object.flags &= ~mark;
551 parents = commit->parents;
555 while ((parents = parents->next))
556 commit_list_insert(parents->item, plist);
558 commit = commit->parents->item;
562 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
564 struct commit_list *list = NULL;
567 clear_commit_marks_1(&list, *commit, mark);
571 clear_commit_marks_1(&list, pop_commit(&list), mark);
574 void clear_commit_marks(struct commit *commit, unsigned int mark)
576 clear_commit_marks_many(1, &commit, mark);
579 struct commit *pop_commit(struct commit_list **stack)
581 struct commit_list *top = *stack;
582 struct commit *item = top ? top->item : NULL;
592 * Topological sort support
595 /* count number of children that have not been emitted */
596 define_commit_slab(indegree_slab, int);
598 /* record author-date for each commit object */
599 define_commit_slab(author_date_slab, unsigned long);
601 static void record_author_date(struct author_date_slab *author_date,
602 struct commit *commit)
604 const char *buffer = get_commit_buffer(commit, NULL);
605 struct ident_split ident;
606 const char *ident_line;
611 ident_line = find_commit_header(buffer, "author", &ident_len);
613 goto fail_exit; /* no author line */
614 if (split_ident_line(&ident, ident_line, ident_len) ||
615 !ident.date_begin || !ident.date_end)
616 goto fail_exit; /* malformed "author" line */
618 date = parse_timestamp(ident.date_begin, &date_end, 10);
619 if (date_end != ident.date_end)
620 goto fail_exit; /* malformed date */
621 *(author_date_slab_at(author_date, commit)) = date;
624 unuse_commit_buffer(commit, buffer);
627 static int compare_commits_by_author_date(const void *a_, const void *b_,
630 const struct commit *a = a_, *b = b_;
631 struct author_date_slab *author_date = cb_data;
632 timestamp_t a_date = *(author_date_slab_at(author_date, a));
633 timestamp_t b_date = *(author_date_slab_at(author_date, b));
635 /* newer commits with larger date first */
638 else if (a_date > b_date)
643 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
645 const struct commit *a = a_, *b = b_;
646 /* newer commits with larger date first */
647 if (a->date < b->date)
649 else if (a->date > b->date)
655 * Performs an in-place topological sort on the list supplied.
657 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
659 struct commit_list *next, *orig = *list;
660 struct commit_list **pptr;
661 struct indegree_slab indegree;
662 struct prio_queue queue;
663 struct commit *commit;
664 struct author_date_slab author_date;
670 init_indegree_slab(&indegree);
671 memset(&queue, '\0', sizeof(queue));
673 switch (sort_order) {
674 default: /* REV_SORT_IN_GRAPH_ORDER */
675 queue.compare = NULL;
677 case REV_SORT_BY_COMMIT_DATE:
678 queue.compare = compare_commits_by_commit_date;
680 case REV_SORT_BY_AUTHOR_DATE:
681 init_author_date_slab(&author_date);
682 queue.compare = compare_commits_by_author_date;
683 queue.cb_data = &author_date;
687 /* Mark them and clear the indegree */
688 for (next = orig; next; next = next->next) {
689 struct commit *commit = next->item;
690 *(indegree_slab_at(&indegree, commit)) = 1;
691 /* also record the author dates, if needed */
692 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
693 record_author_date(&author_date, commit);
696 /* update the indegree */
697 for (next = orig; next; next = next->next) {
698 struct commit_list *parents = next->item->parents;
700 struct commit *parent = parents->item;
701 int *pi = indegree_slab_at(&indegree, parent);
705 parents = parents->next;
712 * tips are nodes not reachable from any other node in the list
714 * the tips serve as a starting set for the work queue.
716 for (next = orig; next; next = next->next) {
717 struct commit *commit = next->item;
719 if (*(indegree_slab_at(&indegree, commit)) == 1)
720 prio_queue_put(&queue, commit);
724 * This is unfortunate; the initial tips need to be shown
725 * in the order given from the revision traversal machinery.
727 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
728 prio_queue_reverse(&queue);
730 /* We no longer need the commit list */
731 free_commit_list(orig);
735 while ((commit = prio_queue_get(&queue)) != NULL) {
736 struct commit_list *parents;
738 for (parents = commit->parents; parents ; parents = parents->next) {
739 struct commit *parent = parents->item;
740 int *pi = indegree_slab_at(&indegree, parent);
746 * parents are only enqueued for emission
747 * when all their children have been emitted thereby
748 * guaranteeing topological order.
751 prio_queue_put(&queue, parent);
754 * all children of commit have already been
755 * emitted. we can emit it now.
757 *(indegree_slab_at(&indegree, commit)) = 0;
759 pptr = &commit_list_insert(commit, pptr)->next;
762 clear_indegree_slab(&indegree);
763 clear_prio_queue(&queue);
764 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
765 clear_author_date_slab(&author_date);
768 /* merge-base stuff */
770 /* Remember to update object flag allocation in object.h */
771 #define PARENT1 (1u<<16)
772 #define PARENT2 (1u<<17)
773 #define STALE (1u<<18)
774 #define RESULT (1u<<19)
776 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
778 static int queue_has_nonstale(struct prio_queue *queue)
781 for (i = 0; i < queue->nr; i++) {
782 struct commit *commit = queue->array[i].data;
783 if (!(commit->object.flags & STALE))
789 /* all input commits in one and twos[] must have been parsed! */
790 static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
792 struct prio_queue queue = { compare_commits_by_commit_date };
793 struct commit_list *result = NULL;
796 one->object.flags |= PARENT1;
798 commit_list_append(one, &result);
801 prio_queue_put(&queue, one);
803 for (i = 0; i < n; i++) {
804 twos[i]->object.flags |= PARENT2;
805 prio_queue_put(&queue, twos[i]);
808 while (queue_has_nonstale(&queue)) {
809 struct commit *commit = prio_queue_get(&queue);
810 struct commit_list *parents;
813 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
814 if (flags == (PARENT1 | PARENT2)) {
815 if (!(commit->object.flags & RESULT)) {
816 commit->object.flags |= RESULT;
817 commit_list_insert_by_date(commit, &result);
819 /* Mark parents of a found merge stale */
822 parents = commit->parents;
824 struct commit *p = parents->item;
825 parents = parents->next;
826 if ((p->object.flags & flags) == flags)
830 p->object.flags |= flags;
831 prio_queue_put(&queue, p);
835 clear_prio_queue(&queue);
839 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
841 struct commit_list *list = NULL;
842 struct commit_list *result = NULL;
845 for (i = 0; i < n; i++) {
848 * We do not mark this even with RESULT so we do not
849 * have to clean it up.
851 return commit_list_insert(one, &result);
854 if (parse_commit(one))
856 for (i = 0; i < n; i++) {
857 if (parse_commit(twos[i]))
861 list = paint_down_to_common(one, n, twos);
864 struct commit *commit = pop_commit(&list);
865 if (!(commit->object.flags & STALE))
866 commit_list_insert_by_date(commit, &result);
871 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
873 struct commit_list *i, *j, *k, *ret = NULL;
878 commit_list_insert(in->item, &ret);
880 for (i = in->next; i; i = i->next) {
881 struct commit_list *new_commits = NULL, *end = NULL;
883 for (j = ret; j; j = j->next) {
884 struct commit_list *bases;
885 bases = get_merge_bases(i->item, j->item);
890 for (k = bases; k; k = k->next)
898 static int remove_redundant(struct commit **array, int cnt)
901 * Some commit in the array may be an ancestor of
902 * another commit. Move such commit to the end of
903 * the array, and return the number of commits that
904 * are independent from each other.
906 struct commit **work;
907 unsigned char *redundant;
911 work = xcalloc(cnt, sizeof(*work));
912 redundant = xcalloc(cnt, 1);
913 ALLOC_ARRAY(filled_index, cnt - 1);
915 for (i = 0; i < cnt; i++)
916 parse_commit(array[i]);
917 for (i = 0; i < cnt; i++) {
918 struct commit_list *common;
922 for (j = filled = 0; j < cnt; j++) {
923 if (i == j || redundant[j])
925 filled_index[filled] = j;
926 work[filled++] = array[j];
928 common = paint_down_to_common(array[i], filled, work);
929 if (array[i]->object.flags & PARENT2)
931 for (j = 0; j < filled; j++)
932 if (work[j]->object.flags & PARENT1)
933 redundant[filled_index[j]] = 1;
934 clear_commit_marks(array[i], all_flags);
935 clear_commit_marks_many(filled, work, all_flags);
936 free_commit_list(common);
939 /* Now collect the result */
940 COPY_ARRAY(work, array, cnt);
941 for (i = filled = 0; i < cnt; i++)
943 array[filled++] = work[i];
944 for (j = filled, i = 0; i < cnt; i++)
946 array[j++] = work[i];
953 static struct commit_list *get_merge_bases_many_0(struct commit *one,
955 struct commit **twos,
958 struct commit_list *list;
959 struct commit **rslt;
960 struct commit_list *result;
963 result = merge_bases_many(one, n, twos);
964 for (i = 0; i < n; i++) {
968 if (!result || !result->next) {
970 clear_commit_marks(one, all_flags);
971 clear_commit_marks_many(n, twos, all_flags);
976 /* There are more than one */
977 cnt = commit_list_count(result);
978 rslt = xcalloc(cnt, sizeof(*rslt));
979 for (list = result, i = 0; list; list = list->next)
980 rslt[i++] = list->item;
981 free_commit_list(result);
983 clear_commit_marks(one, all_flags);
984 clear_commit_marks_many(n, twos, all_flags);
986 cnt = remove_redundant(rslt, cnt);
988 for (i = 0; i < cnt; i++)
989 commit_list_insert_by_date(rslt[i], &result);
994 struct commit_list *get_merge_bases_many(struct commit *one,
996 struct commit **twos)
998 return get_merge_bases_many_0(one, n, twos, 1);
1001 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
1003 struct commit **twos)
1005 return get_merge_bases_many_0(one, n, twos, 0);
1008 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1010 return get_merge_bases_many_0(one, 1, &two, 1);
1014 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1016 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1020 while (with_commit) {
1021 struct commit *other;
1023 other = with_commit->item;
1024 with_commit = with_commit->next;
1025 if (in_merge_bases(other, commit))
1032 * Is "commit" an ancestor of one of the "references"?
1034 int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1036 struct commit_list *bases;
1039 if (parse_commit(commit))
1041 for (i = 0; i < nr_reference; i++)
1042 if (parse_commit(reference[i]))
1045 bases = paint_down_to_common(commit, nr_reference, reference);
1046 if (commit->object.flags & PARENT2)
1048 clear_commit_marks(commit, all_flags);
1049 clear_commit_marks_many(nr_reference, reference, all_flags);
1050 free_commit_list(bases);
1055 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1057 int in_merge_bases(struct commit *commit, struct commit *reference)
1059 return in_merge_bases_many(commit, 1, &reference);
1062 struct commit_list *reduce_heads(struct commit_list *heads)
1064 struct commit_list *p;
1065 struct commit_list *result = NULL, **tail = &result;
1066 struct commit **array;
1073 for (p = heads; p; p = p->next)
1074 p->item->object.flags &= ~STALE;
1075 for (p = heads, num_head = 0; p; p = p->next) {
1076 if (p->item->object.flags & STALE)
1078 p->item->object.flags |= STALE;
1081 array = xcalloc(num_head, sizeof(*array));
1082 for (p = heads, i = 0; p; p = p->next) {
1083 if (p->item->object.flags & STALE) {
1084 array[i++] = p->item;
1085 p->item->object.flags &= ~STALE;
1088 num_head = remove_redundant(array, num_head);
1089 for (i = 0; i < num_head; i++)
1090 tail = &commit_list_insert(array[i], tail)->next;
1095 void reduce_heads_replace(struct commit_list **heads)
1097 struct commit_list *result = reduce_heads(*heads);
1098 free_commit_list(*heads);
1102 static const char gpg_sig_header[] = "gpgsig";
1103 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1105 static int do_sign_commit(struct strbuf *buf, const char *keyid)
1107 struct strbuf sig = STRBUF_INIT;
1108 int inspos, copypos;
1111 /* find the end of the header */
1112 eoh = strstr(buf->buf, "\n\n");
1116 inspos = eoh - buf->buf + 1;
1118 if (!keyid || !*keyid)
1119 keyid = get_signing_key();
1120 if (sign_buffer(buf, &sig, keyid)) {
1121 strbuf_release(&sig);
1125 for (copypos = 0; sig.buf[copypos]; ) {
1126 const char *bol = sig.buf + copypos;
1127 const char *eol = strchrnul(bol, '\n');
1128 int len = (eol - bol) + !!*eol;
1131 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1132 inspos += gpg_sig_header_len;
1134 strbuf_insert(buf, inspos++, " ", 1);
1135 strbuf_insert(buf, inspos, bol, len);
1139 strbuf_release(&sig);
1143 int parse_signed_commit(const struct commit *commit,
1144 struct strbuf *payload, struct strbuf *signature)
1148 const char *buffer = get_commit_buffer(commit, &size);
1149 int in_signature, saw_signature = -1;
1150 const char *line, *tail;
1153 tail = buffer + size;
1156 while (line < tail) {
1157 const char *sig = NULL;
1158 const char *next = memchr(line, '\n', tail - line);
1160 next = next ? next + 1 : tail;
1161 if (in_signature && line[0] == ' ')
1163 else if (starts_with(line, gpg_sig_header) &&
1164 line[gpg_sig_header_len] == ' ')
1165 sig = line + gpg_sig_header_len + 1;
1167 strbuf_add(signature, sig, next - sig);
1172 /* dump the whole remainder of the buffer */
1174 strbuf_add(payload, line, next - line);
1179 unuse_commit_buffer(commit, buffer);
1180 return saw_signature;
1183 int remove_signature(struct strbuf *buf)
1185 const char *line = buf->buf;
1186 const char *tail = buf->buf + buf->len;
1187 int in_signature = 0;
1188 const char *sig_start = NULL;
1189 const char *sig_end = NULL;
1191 while (line < tail) {
1192 const char *next = memchr(line, '\n', tail - line);
1193 next = next ? next + 1 : tail;
1195 if (in_signature && line[0] == ' ')
1197 else if (starts_with(line, gpg_sig_header) &&
1198 line[gpg_sig_header_len] == ' ') {
1204 /* dump the whole remainder of the buffer */
1212 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1214 return sig_start != NULL;
1217 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1219 struct merge_remote_desc *desc;
1220 struct commit_extra_header *mergetag;
1222 unsigned long size, len;
1223 enum object_type type;
1225 desc = merge_remote_util(parent);
1226 if (!desc || !desc->obj)
1228 buf = read_object_file(&desc->obj->oid, &type, &size);
1229 if (!buf || type != OBJ_TAG)
1231 len = parse_signature(buf, size);
1235 * We could verify this signature and either omit the tag when
1236 * it does not validate, but the integrator may not have the
1237 * public key of the signer of the tag he is merging, while a
1238 * later auditor may have it while auditing, so let's not run
1239 * verify-signed-buffer here for now...
1241 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1242 * warn("warning: signed tag unverified.");
1244 mergetag = xcalloc(1, sizeof(*mergetag));
1245 mergetag->key = xstrdup("mergetag");
1246 mergetag->value = buf;
1247 mergetag->len = size;
1250 *tail = &mergetag->next;
1257 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1259 struct strbuf payload = STRBUF_INIT;
1260 struct strbuf signature = STRBUF_INIT;
1265 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1267 ret = check_signature(payload.buf, payload.len, signature.buf,
1268 signature.len, sigc);
1271 strbuf_release(&payload);
1272 strbuf_release(&signature);
1279 void append_merge_tag_headers(struct commit_list *parents,
1280 struct commit_extra_header ***tail)
1283 struct commit *parent = parents->item;
1284 handle_signed_tag(parent, tail);
1285 parents = parents->next;
1289 static void add_extra_header(struct strbuf *buffer,
1290 struct commit_extra_header *extra)
1292 strbuf_addstr(buffer, extra->key);
1294 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1296 strbuf_addch(buffer, '\n');
1299 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1300 const char **exclude)
1302 struct commit_extra_header *extra = NULL;
1304 const char *buffer = get_commit_buffer(commit, &size);
1305 extra = read_commit_extra_header_lines(buffer, size, exclude);
1306 unuse_commit_buffer(commit, buffer);
1310 void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1312 struct commit_extra_header *extra, *to_free;
1314 to_free = read_commit_extra_headers(commit, NULL);
1315 for (extra = to_free; extra; extra = extra->next) {
1316 if (strcmp(extra->key, "mergetag"))
1317 continue; /* not a merge tag */
1318 fn(commit, extra, data);
1320 free_commit_extra_headers(to_free);
1323 static inline int standard_header_field(const char *field, size_t len)
1325 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1326 (len == 6 && !memcmp(field, "parent", 6)) ||
1327 (len == 6 && !memcmp(field, "author", 6)) ||
1328 (len == 9 && !memcmp(field, "committer", 9)) ||
1329 (len == 8 && !memcmp(field, "encoding", 8)));
1332 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1338 size_t xlen = strlen(*exclude);
1339 if (len == xlen && !memcmp(field, *exclude, xlen))
1346 static struct commit_extra_header *read_commit_extra_header_lines(
1347 const char *buffer, size_t size,
1348 const char **exclude)
1350 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1351 const char *line, *next, *eof, *eob;
1352 struct strbuf buf = STRBUF_INIT;
1354 for (line = buffer, eob = line + size;
1355 line < eob && *line != '\n';
1357 next = memchr(line, '\n', eob - line);
1358 next = next ? next + 1 : eob;
1362 strbuf_add(&buf, line + 1, next - (line + 1));
1366 it->value = strbuf_detach(&buf, &it->len);
1370 eof = memchr(line, ' ', next - line);
1373 else if (standard_header_field(line, eof - line) ||
1374 excluded_header_field(line, eof - line, exclude))
1377 it = xcalloc(1, sizeof(*it));
1378 it->key = xmemdupz(line, eof-line);
1382 strbuf_add(&buf, eof + 1, next - (eof + 1));
1385 it->value = strbuf_detach(&buf, &it->len);
1389 void free_commit_extra_headers(struct commit_extra_header *extra)
1392 struct commit_extra_header *next = extra->next;
1400 int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1401 struct commit_list *parents, struct object_id *ret,
1402 const char *author, const char *sign_commit)
1404 struct commit_extra_header *extra = NULL, **tail = &extra;
1407 append_merge_tag_headers(parents, &tail);
1408 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1409 author, sign_commit, extra);
1410 free_commit_extra_headers(extra);
1414 static int find_invalid_utf8(const char *buf, int len)
1417 static const unsigned int max_codepoint[] = {
1418 0x7f, 0x7ff, 0xffff, 0x10ffff
1422 unsigned char c = *buf++;
1423 int bytes, bad_offset;
1424 unsigned int codepoint;
1425 unsigned int min_val, max_val;
1430 /* Simple US-ASCII? No worries. */
1434 bad_offset = offset-1;
1437 * Count how many more high bits set: that's how
1438 * many more bytes this sequence should have.
1447 * Must be between 1 and 3 more bytes. Longer sequences result in
1448 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1450 if (bytes < 1 || 3 < bytes)
1453 /* Do we *have* that many bytes? */
1458 * Place the encoded bits at the bottom of the value and compute the
1461 codepoint = (c & 0x7f) >> bytes;
1462 min_val = max_codepoint[bytes-1] + 1;
1463 max_val = max_codepoint[bytes];
1468 /* And verify that they are good continuation bytes */
1471 codepoint |= *buf & 0x3f;
1472 if ((*buf++ & 0xc0) != 0x80)
1476 /* Reject codepoints that are out of range for the sequence length. */
1477 if (codepoint < min_val || codepoint > max_val)
1479 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1480 if ((codepoint & 0x1ff800) == 0xd800)
1482 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1483 if ((codepoint & 0xfffe) == 0xfffe)
1485 /* So are anything in the range U+FDD0..U+FDEF. */
1486 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1493 * This verifies that the buffer is in proper utf8 format.
1495 * If it isn't, it assumes any non-utf8 characters are Latin1,
1496 * and does the conversion.
1498 static int verify_utf8(struct strbuf *buf)
1506 unsigned char replace[2];
1508 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1514 strbuf_remove(buf, pos, 1);
1516 /* We know 'c' must be in the range 128-255 */
1517 replace[0] = 0xc0 + (c >> 6);
1518 replace[1] = 0x80 + (c & 0x3f);
1519 strbuf_insert(buf, pos, replace, 2);
1524 static const char commit_utf8_warn[] =
1525 N_("Warning: commit message did not conform to UTF-8.\n"
1526 "You may want to amend it after fixing the message, or set the config\n"
1527 "variable i18n.commitencoding to the encoding your project uses.\n");
1529 int commit_tree_extended(const char *msg, size_t msg_len,
1530 const struct object_id *tree,
1531 struct commit_list *parents, struct object_id *ret,
1532 const char *author, const char *sign_commit,
1533 struct commit_extra_header *extra)
1536 int encoding_is_utf8;
1537 struct strbuf buffer;
1539 assert_oid_type(tree, OBJ_TREE);
1541 if (memchr(msg, '\0', msg_len))
1542 return error("a NUL byte in commit log message not allowed.");
1544 /* Not having i18n.commitencoding is the same as having utf-8 */
1545 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1547 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1548 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
1551 * NOTE! This ordering means that the same exact tree merged with a
1552 * different order of parents will be a _different_ changeset even
1553 * if everything else stays the same.
1556 struct commit *parent = pop_commit(&parents);
1557 strbuf_addf(&buffer, "parent %s\n",
1558 oid_to_hex(&parent->object.oid));
1561 /* Person/date information */
1563 author = git_author_info(IDENT_STRICT);
1564 strbuf_addf(&buffer, "author %s\n", author);
1565 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1566 if (!encoding_is_utf8)
1567 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1570 add_extra_header(&buffer, extra);
1571 extra = extra->next;
1573 strbuf_addch(&buffer, '\n');
1575 /* And add the comment */
1576 strbuf_add(&buffer, msg, msg_len);
1578 /* And check the encoding */
1579 if (encoding_is_utf8 && !verify_utf8(&buffer))
1580 fprintf(stderr, _(commit_utf8_warn));
1582 if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
1587 result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
1589 strbuf_release(&buffer);
1593 void set_merge_remote_desc(struct commit *commit,
1594 const char *name, struct object *obj)
1596 struct merge_remote_desc *desc;
1597 FLEX_ALLOC_STR(desc, name, name);
1599 commit->util = desc;
1602 struct commit *get_merge_parent(const char *name)
1605 struct commit *commit;
1606 struct object_id oid;
1607 if (get_oid(name, &oid))
1609 obj = parse_object(&oid);
1610 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1611 if (commit && !commit->util)
1612 set_merge_remote_desc(commit, name, obj);
1617 * Append a commit to the end of the commit_list.
1619 * next starts by pointing to the variable that holds the head of an
1620 * empty commit_list, and is updated to point to the "next" field of
1621 * the last item on the list as new commits are appended.
1625 * struct commit_list *list;
1626 * struct commit_list **next = &list;
1628 * next = commit_list_append(c1, next);
1629 * next = commit_list_append(c2, next);
1630 * assert(commit_list_count(list) == 2);
1633 struct commit_list **commit_list_append(struct commit *commit,
1634 struct commit_list **next)
1636 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1637 new_commit->item = commit;
1639 new_commit->next = NULL;
1640 return &new_commit->next;
1643 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1645 int key_len = strlen(key);
1646 const char *line = msg;
1649 const char *eol = strchrnul(line, '\n');
1654 if (eol - line > key_len &&
1655 !strncmp(line, key, key_len) &&
1656 line[key_len] == ' ') {
1657 *out_len = eol - line - key_len - 1;
1658 return line + key_len + 1;
1660 line = *eol ? eol + 1 : NULL;
1666 * Inspect the given string and determine the true "end" of the log message, in
1667 * order to find where to put a new Signed-off-by: line. Ignored are
1668 * trailing comment lines and blank lines. To support "git commit -s
1669 * --amend" on an existing commit, we also ignore "Conflicts:". To
1670 * support "git commit -v", we truncate at cut lines.
1672 * Returns the number of bytes from the tail to ignore, to be fed as
1673 * the second parameter to append_signoff().
1675 int ignore_non_trailer(const char *buf, size_t len)
1679 int in_old_conflicts_block = 0;
1680 size_t cutoff = wt_status_locate_end(buf, len);
1682 while (bol < cutoff) {
1683 const char *next_line = memchr(buf + bol, '\n', len - bol);
1686 next_line = buf + len;
1690 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1691 /* is this the first of the run of comments? */
1694 /* otherwise, it is just continuing */
1695 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1696 in_old_conflicts_block = 1;
1699 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1700 ; /* a pathname in the conflicts block */
1702 /* the previous was not trailing comment */
1704 in_old_conflicts_block = 0;
1706 bol = next_line - buf;
1708 return boc ? len - boc : len - cutoff;