9 #include "gpg-interface.h"
10 #include "mergesort.h"
11 #include "commit-slab.h"
12 #include "prio-queue.h"
13 #include "sha1-lookup.h"
14 #include "wt-status.h"
16 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
18 int save_commit_buffer = 1;
20 const char *commit_type = "commit";
22 struct commit *lookup_commit_reference_gently(const struct object_id *oid,
25 struct object *obj = deref_tag(parse_object(oid), NULL, 0);
29 return object_as_type(obj, OBJ_COMMIT, quiet);
32 struct commit *lookup_commit_reference(const struct object_id *oid)
34 return lookup_commit_reference_gently(oid, 0);
37 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
39 struct commit *c = lookup_commit_reference(oid);
41 die(_("could not parse %s"), ref_name);
42 if (oidcmp(oid, &c->object.oid)) {
43 warning(_("%s %s is not a commit!"),
44 ref_name, oid_to_hex(oid));
49 struct commit *lookup_commit(const struct object_id *oid)
51 struct object *obj = lookup_object(oid->hash);
53 return create_object(oid->hash, alloc_commit_node());
54 return object_as_type(obj, OBJ_COMMIT, 0);
57 struct commit *lookup_commit_reference_by_name(const char *name)
60 struct commit *commit;
62 if (get_sha1_committish(name, oid.hash))
64 commit = lookup_commit_reference(&oid);
65 if (parse_commit(commit))
70 static timestamp_t parse_commit_date(const char *buf, const char *tail)
76 if (memcmp(buf, "author", 6))
78 while (buf < tail && *buf++ != '\n')
82 if (memcmp(buf, "committer", 9))
84 while (buf < tail && *buf++ != '>')
89 while (buf < tail && *buf++ != '\n')
93 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
94 return parse_timestamp(dateptr, NULL, 10);
97 static struct commit_graft **commit_graft;
98 static int commit_graft_alloc, commit_graft_nr;
100 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
102 struct commit_graft **commit_graft_table = table;
103 return commit_graft_table[index]->oid.hash;
106 static int commit_graft_pos(const unsigned char *sha1)
108 return sha1_pos(sha1, commit_graft, commit_graft_nr,
109 commit_graft_sha1_access);
112 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
114 int pos = commit_graft_pos(graft->oid.hash);
120 free(commit_graft[pos]);
121 commit_graft[pos] = graft;
126 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
128 if (pos < commit_graft_nr)
129 memmove(commit_graft + pos + 1,
131 (commit_graft_nr - pos - 1) *
132 sizeof(*commit_graft));
133 commit_graft[pos] = graft;
137 struct commit_graft *read_graft_line(char *buf, int len)
139 /* The format is just "Commit Parent1 Parent2 ...\n" */
141 struct commit_graft *graft = NULL;
142 const int entry_size = GIT_SHA1_HEXSZ + 1;
144 while (len && isspace(buf[len-1]))
146 if (buf[0] == '#' || buf[0] == '\0')
148 if ((len + 1) % entry_size)
150 i = (len + 1) / entry_size - 1;
151 graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));
152 graft->nr_parent = i;
153 if (get_oid_hex(buf, &graft->oid))
155 for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {
158 if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))
164 error("bad graft data: %s", buf);
169 static int read_graft_file(const char *graft_file)
171 FILE *fp = fopen_or_warn(graft_file, "r");
172 struct strbuf buf = STRBUF_INIT;
175 while (!strbuf_getwholeline(&buf, fp, '\n')) {
176 /* The format is just "Commit Parent1 Parent2 ...\n" */
177 struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
180 if (register_commit_graft(graft, 1))
181 error("duplicate graft data: %s", buf.buf);
184 strbuf_release(&buf);
188 static void prepare_commit_graft(void)
190 static int commit_graft_prepared;
193 if (commit_graft_prepared)
195 graft_file = get_graft_file();
196 read_graft_file(graft_file);
197 /* make sure shallows are read */
198 is_repository_shallow();
199 commit_graft_prepared = 1;
202 struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
205 prepare_commit_graft();
206 pos = commit_graft_pos(sha1);
209 return commit_graft[pos];
212 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
215 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
216 ret = fn(commit_graft[i], cb_data);
220 int unregister_shallow(const struct object_id *oid)
222 int pos = commit_graft_pos(oid->hash);
225 if (pos + 1 < commit_graft_nr)
226 MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1,
227 commit_graft_nr - pos - 1);
232 struct commit_buffer {
236 define_commit_slab(buffer_slab, struct commit_buffer);
237 static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
239 void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
241 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
246 const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
248 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
259 const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
261 const void *ret = get_cached_commit_buffer(commit, sizep);
263 enum object_type type;
265 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
267 die("cannot read commit object %s",
268 oid_to_hex(&commit->object.oid));
269 if (type != OBJ_COMMIT)
270 die("expected commit for %s, got %s",
271 oid_to_hex(&commit->object.oid), typename(type));
278 void unuse_commit_buffer(const struct commit *commit, const void *buffer)
280 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
281 if (!(v && v->buffer == buffer))
282 free((void *)buffer);
285 void free_commit_buffer(struct commit *commit)
287 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
289 FREE_AND_NULL(v->buffer);
294 const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
296 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
313 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
315 const char *tail = buffer;
316 const char *bufptr = buffer;
317 struct object_id parent;
318 struct commit_list **pptr;
319 struct commit_graft *graft;
320 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
321 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
323 if (item->object.parsed)
325 item->object.parsed = 1;
327 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
328 bufptr[tree_entry_len] != '\n')
329 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
330 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
331 return error("bad tree pointer in commit %s",
332 oid_to_hex(&item->object.oid));
333 item->tree = lookup_tree(&parent);
334 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
335 pptr = &item->parents;
337 graft = lookup_commit_graft(item->object.oid.hash);
338 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
339 struct commit *new_parent;
341 if (tail <= bufptr + parent_entry_len + 1 ||
342 get_sha1_hex(bufptr + 7, parent.hash) ||
343 bufptr[parent_entry_len] != '\n')
344 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
345 bufptr += parent_entry_len + 1;
347 * The clone is shallow if nr_parent < 0, and we must
348 * not traverse its real parents even when we unhide them.
350 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
352 new_parent = lookup_commit(&parent);
354 pptr = &commit_list_insert(new_parent, pptr)->next;
358 struct commit *new_parent;
359 for (i = 0; i < graft->nr_parent; i++) {
360 new_parent = lookup_commit(&graft->parent[i]);
363 pptr = &commit_list_insert(new_parent, pptr)->next;
366 item->date = parse_commit_date(bufptr, tail);
371 int parse_commit_gently(struct commit *item, int quiet_on_missing)
373 enum object_type type;
380 if (item->object.parsed)
382 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
384 return quiet_on_missing ? -1 :
385 error("Could not read %s",
386 oid_to_hex(&item->object.oid));
387 if (type != OBJ_COMMIT) {
389 return error("Object %s not a commit",
390 oid_to_hex(&item->object.oid));
392 ret = parse_commit_buffer(item, buffer, size);
393 if (save_commit_buffer && !ret) {
394 set_commit_buffer(item, buffer, size);
401 void parse_commit_or_die(struct commit *item)
403 if (parse_commit(item))
404 die("unable to parse commit %s",
405 item ? oid_to_hex(&item->object.oid) : "(null)");
408 int find_commit_subject(const char *commit_buffer, const char **subject)
411 const char *p = commit_buffer;
413 while (*p && (*p != '\n' || p[1] != '\n'))
416 p = skip_blank_lines(p + 2);
417 eol = strchrnul(p, '\n');
426 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
428 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
429 new_list->item = item;
430 new_list->next = *list_p;
435 unsigned commit_list_count(const struct commit_list *l)
438 for (; l; l = l->next )
443 struct commit_list *copy_commit_list(struct commit_list *list)
445 struct commit_list *head = NULL;
446 struct commit_list **pp = &head;
448 pp = commit_list_append(list->item, pp);
454 void free_commit_list(struct commit_list *list)
460 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
462 struct commit_list **pp = list;
463 struct commit_list *p;
464 while ((p = *pp) != NULL) {
465 if (p->item->date < item->date) {
470 return commit_list_insert(item, pp);
473 static int commit_list_compare_by_date(const void *a, const void *b)
475 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
476 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
484 static void *commit_list_get_next(const void *a)
486 return ((const struct commit_list *)a)->next;
489 static void commit_list_set_next(void *a, void *next)
491 ((struct commit_list *)a)->next = next;
494 void commit_list_sort_by_date(struct commit_list **list)
496 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
497 commit_list_compare_by_date);
500 struct commit *pop_most_recent_commit(struct commit_list **list,
503 struct commit *ret = pop_commit(list);
504 struct commit_list *parents = ret->parents;
507 struct commit *commit = parents->item;
508 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
509 commit->object.flags |= mark;
510 commit_list_insert_by_date(commit, list);
512 parents = parents->next;
517 static void clear_commit_marks_1(struct commit_list **plist,
518 struct commit *commit, unsigned int mark)
521 struct commit_list *parents;
523 if (!(mark & commit->object.flags))
526 commit->object.flags &= ~mark;
528 parents = commit->parents;
532 while ((parents = parents->next))
533 commit_list_insert(parents->item, plist);
535 commit = commit->parents->item;
539 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
541 struct commit_list *list = NULL;
544 commit_list_insert(*commit, &list);
548 clear_commit_marks_1(&list, pop_commit(&list), mark);
551 void clear_commit_marks(struct commit *commit, unsigned int mark)
553 clear_commit_marks_many(1, &commit, mark);
556 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
558 struct object *object;
559 struct commit *commit;
562 for (i = 0; i < a->nr; i++) {
563 object = a->objects[i].item;
564 commit = lookup_commit_reference_gently(&object->oid, 1);
566 clear_commit_marks(commit, mark);
570 struct commit *pop_commit(struct commit_list **stack)
572 struct commit_list *top = *stack;
573 struct commit *item = top ? top->item : NULL;
583 * Topological sort support
586 /* count number of children that have not been emitted */
587 define_commit_slab(indegree_slab, int);
589 /* record author-date for each commit object */
590 define_commit_slab(author_date_slab, unsigned long);
592 static void record_author_date(struct author_date_slab *author_date,
593 struct commit *commit)
595 const char *buffer = get_commit_buffer(commit, NULL);
596 struct ident_split ident;
597 const char *ident_line;
602 ident_line = find_commit_header(buffer, "author", &ident_len);
604 goto fail_exit; /* no author line */
605 if (split_ident_line(&ident, ident_line, ident_len) ||
606 !ident.date_begin || !ident.date_end)
607 goto fail_exit; /* malformed "author" line */
609 date = parse_timestamp(ident.date_begin, &date_end, 10);
610 if (date_end != ident.date_end)
611 goto fail_exit; /* malformed date */
612 *(author_date_slab_at(author_date, commit)) = date;
615 unuse_commit_buffer(commit, buffer);
618 static int compare_commits_by_author_date(const void *a_, const void *b_,
621 const struct commit *a = a_, *b = b_;
622 struct author_date_slab *author_date = cb_data;
623 timestamp_t a_date = *(author_date_slab_at(author_date, a));
624 timestamp_t b_date = *(author_date_slab_at(author_date, b));
626 /* newer commits with larger date first */
629 else if (a_date > b_date)
634 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
636 const struct commit *a = a_, *b = b_;
637 /* newer commits with larger date first */
638 if (a->date < b->date)
640 else if (a->date > b->date)
646 * Performs an in-place topological sort on the list supplied.
648 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
650 struct commit_list *next, *orig = *list;
651 struct commit_list **pptr;
652 struct indegree_slab indegree;
653 struct prio_queue queue;
654 struct commit *commit;
655 struct author_date_slab author_date;
661 init_indegree_slab(&indegree);
662 memset(&queue, '\0', sizeof(queue));
664 switch (sort_order) {
665 default: /* REV_SORT_IN_GRAPH_ORDER */
666 queue.compare = NULL;
668 case REV_SORT_BY_COMMIT_DATE:
669 queue.compare = compare_commits_by_commit_date;
671 case REV_SORT_BY_AUTHOR_DATE:
672 init_author_date_slab(&author_date);
673 queue.compare = compare_commits_by_author_date;
674 queue.cb_data = &author_date;
678 /* Mark them and clear the indegree */
679 for (next = orig; next; next = next->next) {
680 struct commit *commit = next->item;
681 *(indegree_slab_at(&indegree, commit)) = 1;
682 /* also record the author dates, if needed */
683 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
684 record_author_date(&author_date, commit);
687 /* update the indegree */
688 for (next = orig; next; next = next->next) {
689 struct commit_list *parents = next->item->parents;
691 struct commit *parent = parents->item;
692 int *pi = indegree_slab_at(&indegree, parent);
696 parents = parents->next;
703 * tips are nodes not reachable from any other node in the list
705 * the tips serve as a starting set for the work queue.
707 for (next = orig; next; next = next->next) {
708 struct commit *commit = next->item;
710 if (*(indegree_slab_at(&indegree, commit)) == 1)
711 prio_queue_put(&queue, commit);
715 * This is unfortunate; the initial tips need to be shown
716 * in the order given from the revision traversal machinery.
718 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
719 prio_queue_reverse(&queue);
721 /* We no longer need the commit list */
722 free_commit_list(orig);
726 while ((commit = prio_queue_get(&queue)) != NULL) {
727 struct commit_list *parents;
729 for (parents = commit->parents; parents ; parents = parents->next) {
730 struct commit *parent = parents->item;
731 int *pi = indegree_slab_at(&indegree, parent);
737 * parents are only enqueued for emission
738 * when all their children have been emitted thereby
739 * guaranteeing topological order.
742 prio_queue_put(&queue, parent);
745 * all children of commit have already been
746 * emitted. we can emit it now.
748 *(indegree_slab_at(&indegree, commit)) = 0;
750 pptr = &commit_list_insert(commit, pptr)->next;
753 clear_indegree_slab(&indegree);
754 clear_prio_queue(&queue);
755 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
756 clear_author_date_slab(&author_date);
759 /* merge-base stuff */
761 /* Remember to update object flag allocation in object.h */
762 #define PARENT1 (1u<<16)
763 #define PARENT2 (1u<<17)
764 #define STALE (1u<<18)
765 #define RESULT (1u<<19)
767 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
769 static int queue_has_nonstale(struct prio_queue *queue)
772 for (i = 0; i < queue->nr; i++) {
773 struct commit *commit = queue->array[i].data;
774 if (!(commit->object.flags & STALE))
780 /* all input commits in one and twos[] must have been parsed! */
781 static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
783 struct prio_queue queue = { compare_commits_by_commit_date };
784 struct commit_list *result = NULL;
787 one->object.flags |= PARENT1;
789 commit_list_append(one, &result);
792 prio_queue_put(&queue, one);
794 for (i = 0; i < n; i++) {
795 twos[i]->object.flags |= PARENT2;
796 prio_queue_put(&queue, twos[i]);
799 while (queue_has_nonstale(&queue)) {
800 struct commit *commit = prio_queue_get(&queue);
801 struct commit_list *parents;
804 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
805 if (flags == (PARENT1 | PARENT2)) {
806 if (!(commit->object.flags & RESULT)) {
807 commit->object.flags |= RESULT;
808 commit_list_insert_by_date(commit, &result);
810 /* Mark parents of a found merge stale */
813 parents = commit->parents;
815 struct commit *p = parents->item;
816 parents = parents->next;
817 if ((p->object.flags & flags) == flags)
821 p->object.flags |= flags;
822 prio_queue_put(&queue, p);
826 clear_prio_queue(&queue);
830 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
832 struct commit_list *list = NULL;
833 struct commit_list *result = NULL;
836 for (i = 0; i < n; i++) {
839 * We do not mark this even with RESULT so we do not
840 * have to clean it up.
842 return commit_list_insert(one, &result);
845 if (parse_commit(one))
847 for (i = 0; i < n; i++) {
848 if (parse_commit(twos[i]))
852 list = paint_down_to_common(one, n, twos);
855 struct commit *commit = pop_commit(&list);
856 if (!(commit->object.flags & STALE))
857 commit_list_insert_by_date(commit, &result);
862 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
864 struct commit_list *i, *j, *k, *ret = NULL;
869 commit_list_insert(in->item, &ret);
871 for (i = in->next; i; i = i->next) {
872 struct commit_list *new = NULL, *end = NULL;
874 for (j = ret; j; j = j->next) {
875 struct commit_list *bases;
876 bases = get_merge_bases(i->item, j->item);
881 for (k = bases; k; k = k->next)
889 static int remove_redundant(struct commit **array, int cnt)
892 * Some commit in the array may be an ancestor of
893 * another commit. Move such commit to the end of
894 * the array, and return the number of commits that
895 * are independent from each other.
897 struct commit **work;
898 unsigned char *redundant;
902 work = xcalloc(cnt, sizeof(*work));
903 redundant = xcalloc(cnt, 1);
904 ALLOC_ARRAY(filled_index, cnt - 1);
906 for (i = 0; i < cnt; i++)
907 parse_commit(array[i]);
908 for (i = 0; i < cnt; i++) {
909 struct commit_list *common;
913 for (j = filled = 0; j < cnt; j++) {
914 if (i == j || redundant[j])
916 filled_index[filled] = j;
917 work[filled++] = array[j];
919 common = paint_down_to_common(array[i], filled, work);
920 if (array[i]->object.flags & PARENT2)
922 for (j = 0; j < filled; j++)
923 if (work[j]->object.flags & PARENT1)
924 redundant[filled_index[j]] = 1;
925 clear_commit_marks(array[i], all_flags);
926 for (j = 0; j < filled; j++)
927 clear_commit_marks(work[j], all_flags);
928 free_commit_list(common);
931 /* Now collect the result */
932 COPY_ARRAY(work, array, cnt);
933 for (i = filled = 0; i < cnt; i++)
935 array[filled++] = work[i];
936 for (j = filled, i = 0; i < cnt; i++)
938 array[j++] = work[i];
945 static struct commit_list *get_merge_bases_many_0(struct commit *one,
947 struct commit **twos,
950 struct commit_list *list;
951 struct commit **rslt;
952 struct commit_list *result;
955 result = merge_bases_many(one, n, twos);
956 for (i = 0; i < n; i++) {
960 if (!result || !result->next) {
962 clear_commit_marks(one, all_flags);
963 clear_commit_marks_many(n, twos, all_flags);
968 /* There are more than one */
969 cnt = commit_list_count(result);
970 rslt = xcalloc(cnt, sizeof(*rslt));
971 for (list = result, i = 0; list; list = list->next)
972 rslt[i++] = list->item;
973 free_commit_list(result);
975 clear_commit_marks(one, all_flags);
976 clear_commit_marks_many(n, twos, all_flags);
978 cnt = remove_redundant(rslt, cnt);
980 for (i = 0; i < cnt; i++)
981 commit_list_insert_by_date(rslt[i], &result);
986 struct commit_list *get_merge_bases_many(struct commit *one,
988 struct commit **twos)
990 return get_merge_bases_many_0(one, n, twos, 1);
993 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
995 struct commit **twos)
997 return get_merge_bases_many_0(one, n, twos, 0);
1000 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1002 return get_merge_bases_many_0(one, 1, &two, 1);
1006 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1008 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1012 while (with_commit) {
1013 struct commit *other;
1015 other = with_commit->item;
1016 with_commit = with_commit->next;
1017 if (in_merge_bases(other, commit))
1024 * Is "commit" an ancestor of one of the "references"?
1026 int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1028 struct commit_list *bases;
1031 if (parse_commit(commit))
1033 for (i = 0; i < nr_reference; i++)
1034 if (parse_commit(reference[i]))
1037 bases = paint_down_to_common(commit, nr_reference, reference);
1038 if (commit->object.flags & PARENT2)
1040 clear_commit_marks(commit, all_flags);
1041 clear_commit_marks_many(nr_reference, reference, all_flags);
1042 free_commit_list(bases);
1047 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1049 int in_merge_bases(struct commit *commit, struct commit *reference)
1051 return in_merge_bases_many(commit, 1, &reference);
1054 struct commit_list *reduce_heads(struct commit_list *heads)
1056 struct commit_list *p;
1057 struct commit_list *result = NULL, **tail = &result;
1058 struct commit **array;
1065 for (p = heads; p; p = p->next)
1066 p->item->object.flags &= ~STALE;
1067 for (p = heads, num_head = 0; p; p = p->next) {
1068 if (p->item->object.flags & STALE)
1070 p->item->object.flags |= STALE;
1073 array = xcalloc(num_head, sizeof(*array));
1074 for (p = heads, i = 0; p; p = p->next) {
1075 if (p->item->object.flags & STALE) {
1076 array[i++] = p->item;
1077 p->item->object.flags &= ~STALE;
1080 num_head = remove_redundant(array, num_head);
1081 for (i = 0; i < num_head; i++)
1082 tail = &commit_list_insert(array[i], tail)->next;
1087 static const char gpg_sig_header[] = "gpgsig";
1088 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1090 static int do_sign_commit(struct strbuf *buf, const char *keyid)
1092 struct strbuf sig = STRBUF_INIT;
1093 int inspos, copypos;
1096 /* find the end of the header */
1097 eoh = strstr(buf->buf, "\n\n");
1101 inspos = eoh - buf->buf + 1;
1103 if (!keyid || !*keyid)
1104 keyid = get_signing_key();
1105 if (sign_buffer(buf, &sig, keyid)) {
1106 strbuf_release(&sig);
1110 for (copypos = 0; sig.buf[copypos]; ) {
1111 const char *bol = sig.buf + copypos;
1112 const char *eol = strchrnul(bol, '\n');
1113 int len = (eol - bol) + !!*eol;
1116 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1117 inspos += gpg_sig_header_len;
1119 strbuf_insert(buf, inspos++, " ", 1);
1120 strbuf_insert(buf, inspos, bol, len);
1124 strbuf_release(&sig);
1128 int parse_signed_commit(const struct commit *commit,
1129 struct strbuf *payload, struct strbuf *signature)
1133 const char *buffer = get_commit_buffer(commit, &size);
1134 int in_signature, saw_signature = -1;
1135 const char *line, *tail;
1138 tail = buffer + size;
1141 while (line < tail) {
1142 const char *sig = NULL;
1143 const char *next = memchr(line, '\n', tail - line);
1145 next = next ? next + 1 : tail;
1146 if (in_signature && line[0] == ' ')
1148 else if (starts_with(line, gpg_sig_header) &&
1149 line[gpg_sig_header_len] == ' ')
1150 sig = line + gpg_sig_header_len + 1;
1152 strbuf_add(signature, sig, next - sig);
1157 /* dump the whole remainder of the buffer */
1159 strbuf_add(payload, line, next - line);
1164 unuse_commit_buffer(commit, buffer);
1165 return saw_signature;
1168 int remove_signature(struct strbuf *buf)
1170 const char *line = buf->buf;
1171 const char *tail = buf->buf + buf->len;
1172 int in_signature = 0;
1173 const char *sig_start = NULL;
1174 const char *sig_end = NULL;
1176 while (line < tail) {
1177 const char *next = memchr(line, '\n', tail - line);
1178 next = next ? next + 1 : tail;
1180 if (in_signature && line[0] == ' ')
1182 else if (starts_with(line, gpg_sig_header) &&
1183 line[gpg_sig_header_len] == ' ') {
1189 /* dump the whole remainder of the buffer */
1197 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1199 return sig_start != NULL;
1202 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1204 struct merge_remote_desc *desc;
1205 struct commit_extra_header *mergetag;
1207 unsigned long size, len;
1208 enum object_type type;
1210 desc = merge_remote_util(parent);
1211 if (!desc || !desc->obj)
1213 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
1214 if (!buf || type != OBJ_TAG)
1216 len = parse_signature(buf, size);
1220 * We could verify this signature and either omit the tag when
1221 * it does not validate, but the integrator may not have the
1222 * public key of the signer of the tag he is merging, while a
1223 * later auditor may have it while auditing, so let's not run
1224 * verify-signed-buffer here for now...
1226 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1227 * warn("warning: signed tag unverified.");
1229 mergetag = xcalloc(1, sizeof(*mergetag));
1230 mergetag->key = xstrdup("mergetag");
1231 mergetag->value = buf;
1232 mergetag->len = size;
1235 *tail = &mergetag->next;
1242 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1244 struct strbuf payload = STRBUF_INIT;
1245 struct strbuf signature = STRBUF_INIT;
1250 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1252 ret = check_signature(payload.buf, payload.len, signature.buf,
1253 signature.len, sigc);
1256 strbuf_release(&payload);
1257 strbuf_release(&signature);
1264 void append_merge_tag_headers(struct commit_list *parents,
1265 struct commit_extra_header ***tail)
1268 struct commit *parent = parents->item;
1269 handle_signed_tag(parent, tail);
1270 parents = parents->next;
1274 static void add_extra_header(struct strbuf *buffer,
1275 struct commit_extra_header *extra)
1277 strbuf_addstr(buffer, extra->key);
1279 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1281 strbuf_addch(buffer, '\n');
1284 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1285 const char **exclude)
1287 struct commit_extra_header *extra = NULL;
1289 const char *buffer = get_commit_buffer(commit, &size);
1290 extra = read_commit_extra_header_lines(buffer, size, exclude);
1291 unuse_commit_buffer(commit, buffer);
1295 void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1297 struct commit_extra_header *extra, *to_free;
1299 to_free = read_commit_extra_headers(commit, NULL);
1300 for (extra = to_free; extra; extra = extra->next) {
1301 if (strcmp(extra->key, "mergetag"))
1302 continue; /* not a merge tag */
1303 fn(commit, extra, data);
1305 free_commit_extra_headers(to_free);
1308 static inline int standard_header_field(const char *field, size_t len)
1310 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1311 (len == 6 && !memcmp(field, "parent", 6)) ||
1312 (len == 6 && !memcmp(field, "author", 6)) ||
1313 (len == 9 && !memcmp(field, "committer", 9)) ||
1314 (len == 8 && !memcmp(field, "encoding", 8)));
1317 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1323 size_t xlen = strlen(*exclude);
1324 if (len == xlen && !memcmp(field, *exclude, xlen))
1331 static struct commit_extra_header *read_commit_extra_header_lines(
1332 const char *buffer, size_t size,
1333 const char **exclude)
1335 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1336 const char *line, *next, *eof, *eob;
1337 struct strbuf buf = STRBUF_INIT;
1339 for (line = buffer, eob = line + size;
1340 line < eob && *line != '\n';
1342 next = memchr(line, '\n', eob - line);
1343 next = next ? next + 1 : eob;
1347 strbuf_add(&buf, line + 1, next - (line + 1));
1351 it->value = strbuf_detach(&buf, &it->len);
1355 eof = memchr(line, ' ', next - line);
1358 else if (standard_header_field(line, eof - line) ||
1359 excluded_header_field(line, eof - line, exclude))
1362 it = xcalloc(1, sizeof(*it));
1363 it->key = xmemdupz(line, eof-line);
1367 strbuf_add(&buf, eof + 1, next - (eof + 1));
1370 it->value = strbuf_detach(&buf, &it->len);
1374 void free_commit_extra_headers(struct commit_extra_header *extra)
1377 struct commit_extra_header *next = extra->next;
1385 int commit_tree(const char *msg, size_t msg_len,
1386 const unsigned char *tree,
1387 struct commit_list *parents, unsigned char *ret,
1388 const char *author, const char *sign_commit)
1390 struct commit_extra_header *extra = NULL, **tail = &extra;
1393 append_merge_tag_headers(parents, &tail);
1394 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1395 author, sign_commit, extra);
1396 free_commit_extra_headers(extra);
1400 static int find_invalid_utf8(const char *buf, int len)
1403 static const unsigned int max_codepoint[] = {
1404 0x7f, 0x7ff, 0xffff, 0x10ffff
1408 unsigned char c = *buf++;
1409 int bytes, bad_offset;
1410 unsigned int codepoint;
1411 unsigned int min_val, max_val;
1416 /* Simple US-ASCII? No worries. */
1420 bad_offset = offset-1;
1423 * Count how many more high bits set: that's how
1424 * many more bytes this sequence should have.
1433 * Must be between 1 and 3 more bytes. Longer sequences result in
1434 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1436 if (bytes < 1 || 3 < bytes)
1439 /* Do we *have* that many bytes? */
1444 * Place the encoded bits at the bottom of the value and compute the
1447 codepoint = (c & 0x7f) >> bytes;
1448 min_val = max_codepoint[bytes-1] + 1;
1449 max_val = max_codepoint[bytes];
1454 /* And verify that they are good continuation bytes */
1457 codepoint |= *buf & 0x3f;
1458 if ((*buf++ & 0xc0) != 0x80)
1462 /* Reject codepoints that are out of range for the sequence length. */
1463 if (codepoint < min_val || codepoint > max_val)
1465 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1466 if ((codepoint & 0x1ff800) == 0xd800)
1468 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1469 if ((codepoint & 0xfffe) == 0xfffe)
1471 /* So are anything in the range U+FDD0..U+FDEF. */
1472 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1479 * This verifies that the buffer is in proper utf8 format.
1481 * If it isn't, it assumes any non-utf8 characters are Latin1,
1482 * and does the conversion.
1484 static int verify_utf8(struct strbuf *buf)
1492 unsigned char replace[2];
1494 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1500 strbuf_remove(buf, pos, 1);
1502 /* We know 'c' must be in the range 128-255 */
1503 replace[0] = 0xc0 + (c >> 6);
1504 replace[1] = 0x80 + (c & 0x3f);
1505 strbuf_insert(buf, pos, replace, 2);
1510 static const char commit_utf8_warn[] =
1511 N_("Warning: commit message did not conform to UTF-8.\n"
1512 "You may want to amend it after fixing the message, or set the config\n"
1513 "variable i18n.commitencoding to the encoding your project uses.\n");
1515 int commit_tree_extended(const char *msg, size_t msg_len,
1516 const unsigned char *tree,
1517 struct commit_list *parents, unsigned char *ret,
1518 const char *author, const char *sign_commit,
1519 struct commit_extra_header *extra)
1522 int encoding_is_utf8;
1523 struct strbuf buffer;
1525 assert_sha1_type(tree, OBJ_TREE);
1527 if (memchr(msg, '\0', msg_len))
1528 return error("a NUL byte in commit log message not allowed.");
1530 /* Not having i18n.commitencoding is the same as having utf-8 */
1531 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1533 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1534 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1537 * NOTE! This ordering means that the same exact tree merged with a
1538 * different order of parents will be a _different_ changeset even
1539 * if everything else stays the same.
1542 struct commit *parent = pop_commit(&parents);
1543 strbuf_addf(&buffer, "parent %s\n",
1544 oid_to_hex(&parent->object.oid));
1547 /* Person/date information */
1549 author = git_author_info(IDENT_STRICT);
1550 strbuf_addf(&buffer, "author %s\n", author);
1551 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1552 if (!encoding_is_utf8)
1553 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1556 add_extra_header(&buffer, extra);
1557 extra = extra->next;
1559 strbuf_addch(&buffer, '\n');
1561 /* And add the comment */
1562 strbuf_add(&buffer, msg, msg_len);
1564 /* And check the encoding */
1565 if (encoding_is_utf8 && !verify_utf8(&buffer))
1566 fprintf(stderr, _(commit_utf8_warn));
1568 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1571 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1572 strbuf_release(&buffer);
1576 void set_merge_remote_desc(struct commit *commit,
1577 const char *name, struct object *obj)
1579 struct merge_remote_desc *desc;
1580 FLEX_ALLOC_STR(desc, name, name);
1582 commit->util = desc;
1585 struct commit *get_merge_parent(const char *name)
1588 struct commit *commit;
1589 struct object_id oid;
1590 if (get_sha1(name, oid.hash))
1592 obj = parse_object(&oid);
1593 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1594 if (commit && !commit->util)
1595 set_merge_remote_desc(commit, name, obj);
1600 * Append a commit to the end of the commit_list.
1602 * next starts by pointing to the variable that holds the head of an
1603 * empty commit_list, and is updated to point to the "next" field of
1604 * the last item on the list as new commits are appended.
1608 * struct commit_list *list;
1609 * struct commit_list **next = &list;
1611 * next = commit_list_append(c1, next);
1612 * next = commit_list_append(c2, next);
1613 * assert(commit_list_count(list) == 2);
1616 struct commit_list **commit_list_append(struct commit *commit,
1617 struct commit_list **next)
1619 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1626 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1628 int key_len = strlen(key);
1629 const char *line = msg;
1632 const char *eol = strchrnul(line, '\n');
1637 if (eol - line > key_len &&
1638 !strncmp(line, key, key_len) &&
1639 line[key_len] == ' ') {
1640 *out_len = eol - line - key_len - 1;
1641 return line + key_len + 1;
1643 line = *eol ? eol + 1 : NULL;
1649 * Inspect the given string and determine the true "end" of the log message, in
1650 * order to find where to put a new Signed-off-by: line. Ignored are
1651 * trailing comment lines and blank lines. To support "git commit -s
1652 * --amend" on an existing commit, we also ignore "Conflicts:". To
1653 * support "git commit -v", we truncate at cut lines.
1655 * Returns the number of bytes from the tail to ignore, to be fed as
1656 * the second parameter to append_signoff().
1658 int ignore_non_trailer(const char *buf, size_t len)
1662 int in_old_conflicts_block = 0;
1663 size_t cutoff = wt_status_locate_end(buf, len);
1665 while (bol < cutoff) {
1666 const char *next_line = memchr(buf + bol, '\n', len - bol);
1669 next_line = buf + len;
1673 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1674 /* is this the first of the run of comments? */
1677 /* otherwise, it is just continuing */
1678 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1679 in_old_conflicts_block = 1;
1682 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1683 ; /* a pathname in the conflicts block */
1685 /* the previous was not trailing comment */
1687 in_old_conflicts_block = 0;
1689 bol = next_line - buf;
1691 return boc ? len - boc : len - cutoff;