Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
[git/jnareb-git.git] / commit.c
blob516a4ff7d21d5ebcfabda7b1b886eb10b05cebfc
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "pkt-line.h"
5 #include "utf8.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "notes.h"
9 #include "gpg-interface.h"
10 #include "mergesort.h"
12 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
14 int save_commit_buffer = 1;
16 const char *commit_type = "commit";
18 static struct commit *check_commit(struct object *obj,
19 const unsigned char *sha1,
20 int quiet)
22 if (obj->type != OBJ_COMMIT) {
23 if (!quiet)
24 error("Object %s is a %s, not a commit",
25 sha1_to_hex(sha1), typename(obj->type));
26 return NULL;
28 return (struct commit *) obj;
31 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
32 int quiet)
34 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
36 if (!obj)
37 return NULL;
38 return check_commit(obj, sha1, quiet);
41 struct commit *lookup_commit_reference(const unsigned char *sha1)
43 return lookup_commit_reference_gently(sha1, 0);
46 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
48 struct commit *c = lookup_commit_reference(sha1);
49 if (!c)
50 die(_("could not parse %s"), ref_name);
51 if (hashcmp(sha1, c->object.sha1)) {
52 warning(_("%s %s is not a commit!"),
53 ref_name, sha1_to_hex(sha1));
55 return c;
58 struct commit *lookup_commit(const unsigned char *sha1)
60 struct object *obj = lookup_object(sha1);
61 if (!obj)
62 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
63 if (!obj->type)
64 obj->type = OBJ_COMMIT;
65 return check_commit(obj, sha1, 0);
68 struct commit *lookup_commit_reference_by_name(const char *name)
70 unsigned char sha1[20];
71 struct commit *commit;
73 if (get_sha1_committish(name, sha1))
74 return NULL;
75 commit = lookup_commit_reference(sha1);
76 if (!commit || parse_commit(commit))
77 return NULL;
78 return commit;
81 static unsigned long parse_commit_date(const char *buf, const char *tail)
83 const char *dateptr;
85 if (buf + 6 >= tail)
86 return 0;
87 if (memcmp(buf, "author", 6))
88 return 0;
89 while (buf < tail && *buf++ != '\n')
90 /* nada */;
91 if (buf + 9 >= tail)
92 return 0;
93 if (memcmp(buf, "committer", 9))
94 return 0;
95 while (buf < tail && *buf++ != '>')
96 /* nada */;
97 if (buf >= tail)
98 return 0;
99 dateptr = buf;
100 while (buf < tail && *buf++ != '\n')
101 /* nada */;
102 if (buf >= tail)
103 return 0;
104 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
105 return strtoul(dateptr, NULL, 10);
108 static struct commit_graft **commit_graft;
109 static int commit_graft_alloc, commit_graft_nr;
111 static int commit_graft_pos(const unsigned char *sha1)
113 int lo, hi;
114 lo = 0;
115 hi = commit_graft_nr;
116 while (lo < hi) {
117 int mi = (lo + hi) / 2;
118 struct commit_graft *graft = commit_graft[mi];
119 int cmp = hashcmp(sha1, graft->sha1);
120 if (!cmp)
121 return mi;
122 if (cmp < 0)
123 hi = mi;
124 else
125 lo = mi + 1;
127 return -lo - 1;
130 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
132 int pos = commit_graft_pos(graft->sha1);
134 if (0 <= pos) {
135 if (ignore_dups)
136 free(graft);
137 else {
138 free(commit_graft[pos]);
139 commit_graft[pos] = graft;
141 return 1;
143 pos = -pos - 1;
144 if (commit_graft_alloc <= ++commit_graft_nr) {
145 commit_graft_alloc = alloc_nr(commit_graft_alloc);
146 commit_graft = xrealloc(commit_graft,
147 sizeof(*commit_graft) *
148 commit_graft_alloc);
150 if (pos < commit_graft_nr)
151 memmove(commit_graft + pos + 1,
152 commit_graft + pos,
153 (commit_graft_nr - pos - 1) *
154 sizeof(*commit_graft));
155 commit_graft[pos] = graft;
156 return 0;
159 struct commit_graft *read_graft_line(char *buf, int len)
161 /* The format is just "Commit Parent1 Parent2 ...\n" */
162 int i;
163 struct commit_graft *graft = NULL;
165 while (len && isspace(buf[len-1]))
166 buf[--len] = '\0';
167 if (buf[0] == '#' || buf[0] == '\0')
168 return NULL;
169 if ((len + 1) % 41)
170 goto bad_graft_data;
171 i = (len + 1) / 41 - 1;
172 graft = xmalloc(sizeof(*graft) + 20 * i);
173 graft->nr_parent = i;
174 if (get_sha1_hex(buf, graft->sha1))
175 goto bad_graft_data;
176 for (i = 40; i < len; i += 41) {
177 if (buf[i] != ' ')
178 goto bad_graft_data;
179 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
180 goto bad_graft_data;
182 return graft;
184 bad_graft_data:
185 error("bad graft data: %s", buf);
186 free(graft);
187 return NULL;
190 static int read_graft_file(const char *graft_file)
192 FILE *fp = fopen(graft_file, "r");
193 char buf[1024];
194 if (!fp)
195 return -1;
196 while (fgets(buf, sizeof(buf), fp)) {
197 /* The format is just "Commit Parent1 Parent2 ...\n" */
198 int len = strlen(buf);
199 struct commit_graft *graft = read_graft_line(buf, len);
200 if (!graft)
201 continue;
202 if (register_commit_graft(graft, 1))
203 error("duplicate graft data: %s", buf);
205 fclose(fp);
206 return 0;
209 static void prepare_commit_graft(void)
211 static int commit_graft_prepared;
212 char *graft_file;
214 if (commit_graft_prepared)
215 return;
216 graft_file = get_graft_file();
217 read_graft_file(graft_file);
218 /* make sure shallows are read */
219 is_repository_shallow();
220 commit_graft_prepared = 1;
223 struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
225 int pos;
226 prepare_commit_graft();
227 pos = commit_graft_pos(sha1);
228 if (pos < 0)
229 return NULL;
230 return commit_graft[pos];
233 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
235 int i, ret;
236 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
237 ret = fn(commit_graft[i], cb_data);
238 return ret;
241 int unregister_shallow(const unsigned char *sha1)
243 int pos = commit_graft_pos(sha1);
244 if (pos < 0)
245 return -1;
246 if (pos + 1 < commit_graft_nr)
247 memmove(commit_graft + pos, commit_graft + pos + 1,
248 sizeof(struct commit_graft *)
249 * (commit_graft_nr - pos - 1));
250 commit_graft_nr--;
251 return 0;
254 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
256 const char *tail = buffer;
257 const char *bufptr = buffer;
258 unsigned char parent[20];
259 struct commit_list **pptr;
260 struct commit_graft *graft;
262 if (item->object.parsed)
263 return 0;
264 item->object.parsed = 1;
265 tail += size;
266 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
267 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
268 if (get_sha1_hex(bufptr + 5, parent) < 0)
269 return error("bad tree pointer in commit %s",
270 sha1_to_hex(item->object.sha1));
271 item->tree = lookup_tree(parent);
272 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
273 pptr = &item->parents;
275 graft = lookup_commit_graft(item->object.sha1);
276 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
277 struct commit *new_parent;
279 if (tail <= bufptr + 48 ||
280 get_sha1_hex(bufptr + 7, parent) ||
281 bufptr[47] != '\n')
282 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
283 bufptr += 48;
285 * The clone is shallow if nr_parent < 0, and we must
286 * not traverse its real parents even when we unhide them.
288 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
289 continue;
290 new_parent = lookup_commit(parent);
291 if (new_parent)
292 pptr = &commit_list_insert(new_parent, pptr)->next;
294 if (graft) {
295 int i;
296 struct commit *new_parent;
297 for (i = 0; i < graft->nr_parent; i++) {
298 new_parent = lookup_commit(graft->parent[i]);
299 if (!new_parent)
300 continue;
301 pptr = &commit_list_insert(new_parent, pptr)->next;
304 item->date = parse_commit_date(bufptr, tail);
306 return 0;
309 int parse_commit(struct commit *item)
311 enum object_type type;
312 void *buffer;
313 unsigned long size;
314 int ret;
316 if (!item)
317 return -1;
318 if (item->object.parsed)
319 return 0;
320 buffer = read_sha1_file(item->object.sha1, &type, &size);
321 if (!buffer)
322 return error("Could not read %s",
323 sha1_to_hex(item->object.sha1));
324 if (type != OBJ_COMMIT) {
325 free(buffer);
326 return error("Object %s not a commit",
327 sha1_to_hex(item->object.sha1));
329 ret = parse_commit_buffer(item, buffer, size);
330 if (save_commit_buffer && !ret) {
331 item->buffer = buffer;
332 return 0;
334 free(buffer);
335 return ret;
338 int find_commit_subject(const char *commit_buffer, const char **subject)
340 const char *eol;
341 const char *p = commit_buffer;
343 while (*p && (*p != '\n' || p[1] != '\n'))
344 p++;
345 if (*p) {
346 p += 2;
347 for (eol = p; *eol && *eol != '\n'; eol++)
348 ; /* do nothing */
349 } else
350 eol = p;
352 *subject = p;
354 return eol - p;
357 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
359 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
360 new_list->item = item;
361 new_list->next = *list_p;
362 *list_p = new_list;
363 return new_list;
366 unsigned commit_list_count(const struct commit_list *l)
368 unsigned c = 0;
369 for (; l; l = l->next )
370 c++;
371 return c;
374 void free_commit_list(struct commit_list *list)
376 while (list) {
377 struct commit_list *temp = list;
378 list = temp->next;
379 free(temp);
383 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
385 struct commit_list **pp = list;
386 struct commit_list *p;
387 while ((p = *pp) != NULL) {
388 if (p->item->date < item->date) {
389 break;
391 pp = &p->next;
393 return commit_list_insert(item, pp);
396 static int commit_list_compare_by_date(const void *a, const void *b)
398 unsigned long a_date = ((const struct commit_list *)a)->item->date;
399 unsigned long b_date = ((const struct commit_list *)b)->item->date;
400 if (a_date < b_date)
401 return 1;
402 if (a_date > b_date)
403 return -1;
404 return 0;
407 static void *commit_list_get_next(const void *a)
409 return ((const struct commit_list *)a)->next;
412 static void commit_list_set_next(void *a, void *next)
414 ((struct commit_list *)a)->next = next;
417 void commit_list_sort_by_date(struct commit_list **list)
419 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
420 commit_list_compare_by_date);
423 struct commit *pop_most_recent_commit(struct commit_list **list,
424 unsigned int mark)
426 struct commit *ret = (*list)->item;
427 struct commit_list *parents = ret->parents;
428 struct commit_list *old = *list;
430 *list = (*list)->next;
431 free(old);
433 while (parents) {
434 struct commit *commit = parents->item;
435 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
436 commit->object.flags |= mark;
437 commit_list_insert_by_date(commit, list);
439 parents = parents->next;
441 return ret;
444 static void clear_commit_marks_1(struct commit_list **plist,
445 struct commit *commit, unsigned int mark)
447 while (commit) {
448 struct commit_list *parents;
450 if (!(mark & commit->object.flags))
451 return;
453 commit->object.flags &= ~mark;
455 parents = commit->parents;
456 if (!parents)
457 return;
459 while ((parents = parents->next))
460 commit_list_insert(parents->item, plist);
462 commit = commit->parents->item;
466 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
468 struct commit_list *list = NULL;
470 while (nr--) {
471 commit_list_insert(*commit, &list);
472 commit++;
474 while (list)
475 clear_commit_marks_1(&list, pop_commit(&list), mark);
478 void clear_commit_marks(struct commit *commit, unsigned int mark)
480 clear_commit_marks_many(1, &commit, mark);
483 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
485 struct object *object;
486 struct commit *commit;
487 unsigned int i;
489 for (i = 0; i < a->nr; i++) {
490 object = a->objects[i].item;
491 commit = lookup_commit_reference_gently(object->sha1, 1);
492 if (commit)
493 clear_commit_marks(commit, mark);
497 struct commit *pop_commit(struct commit_list **stack)
499 struct commit_list *top = *stack;
500 struct commit *item = top ? top->item : NULL;
502 if (top) {
503 *stack = top->next;
504 free(top);
506 return item;
510 * Performs an in-place topological sort on the list supplied.
512 void sort_in_topological_order(struct commit_list ** list, int lifo)
514 struct commit_list *next, *orig = *list;
515 struct commit_list *work, **insert;
516 struct commit_list **pptr;
518 if (!orig)
519 return;
520 *list = NULL;
522 /* Mark them and clear the indegree */
523 for (next = orig; next; next = next->next) {
524 struct commit *commit = next->item;
525 commit->indegree = 1;
528 /* update the indegree */
529 for (next = orig; next; next = next->next) {
530 struct commit_list * parents = next->item->parents;
531 while (parents) {
532 struct commit *parent = parents->item;
534 if (parent->indegree)
535 parent->indegree++;
536 parents = parents->next;
541 * find the tips
543 * tips are nodes not reachable from any other node in the list
545 * the tips serve as a starting set for the work queue.
547 work = NULL;
548 insert = &work;
549 for (next = orig; next; next = next->next) {
550 struct commit *commit = next->item;
552 if (commit->indegree == 1)
553 insert = &commit_list_insert(commit, insert)->next;
556 /* process the list in topological order */
557 if (!lifo)
558 commit_list_sort_by_date(&work);
560 pptr = list;
561 *list = NULL;
562 while (work) {
563 struct commit *commit;
564 struct commit_list *parents, *work_item;
566 work_item = work;
567 work = work_item->next;
568 work_item->next = NULL;
570 commit = work_item->item;
571 for (parents = commit->parents; parents ; parents = parents->next) {
572 struct commit *parent = parents->item;
574 if (!parent->indegree)
575 continue;
578 * parents are only enqueued for emission
579 * when all their children have been emitted thereby
580 * guaranteeing topological order.
582 if (--parent->indegree == 1) {
583 if (!lifo)
584 commit_list_insert_by_date(parent, &work);
585 else
586 commit_list_insert(parent, &work);
590 * work_item is a commit all of whose children
591 * have already been emitted. we can emit it now.
593 commit->indegree = 0;
594 *pptr = work_item;
595 pptr = &work_item->next;
599 /* merge-base stuff */
601 /* bits #0..15 in revision.h */
602 #define PARENT1 (1u<<16)
603 #define PARENT2 (1u<<17)
604 #define STALE (1u<<18)
605 #define RESULT (1u<<19)
607 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
609 static struct commit *interesting(struct commit_list *list)
611 while (list) {
612 struct commit *commit = list->item;
613 list = list->next;
614 if (commit->object.flags & STALE)
615 continue;
616 return commit;
618 return NULL;
621 /* all input commits in one and twos[] must have been parsed! */
622 static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
624 struct commit_list *list = NULL;
625 struct commit_list *result = NULL;
626 int i;
628 one->object.flags |= PARENT1;
629 commit_list_insert_by_date(one, &list);
630 if (!n)
631 return list;
632 for (i = 0; i < n; i++) {
633 twos[i]->object.flags |= PARENT2;
634 commit_list_insert_by_date(twos[i], &list);
637 while (interesting(list)) {
638 struct commit *commit;
639 struct commit_list *parents;
640 struct commit_list *next;
641 int flags;
643 commit = list->item;
644 next = list->next;
645 free(list);
646 list = next;
648 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
649 if (flags == (PARENT1 | PARENT2)) {
650 if (!(commit->object.flags & RESULT)) {
651 commit->object.flags |= RESULT;
652 commit_list_insert_by_date(commit, &result);
654 /* Mark parents of a found merge stale */
655 flags |= STALE;
657 parents = commit->parents;
658 while (parents) {
659 struct commit *p = parents->item;
660 parents = parents->next;
661 if ((p->object.flags & flags) == flags)
662 continue;
663 if (parse_commit(p))
664 return NULL;
665 p->object.flags |= flags;
666 commit_list_insert_by_date(p, &list);
670 free_commit_list(list);
671 return result;
674 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
676 struct commit_list *list = NULL;
677 struct commit_list *result = NULL;
678 int i;
680 for (i = 0; i < n; i++) {
681 if (one == twos[i])
683 * We do not mark this even with RESULT so we do not
684 * have to clean it up.
686 return commit_list_insert(one, &result);
689 if (parse_commit(one))
690 return NULL;
691 for (i = 0; i < n; i++) {
692 if (parse_commit(twos[i]))
693 return NULL;
696 list = paint_down_to_common(one, n, twos);
698 while (list) {
699 struct commit_list *next = list->next;
700 if (!(list->item->object.flags & STALE))
701 commit_list_insert_by_date(list->item, &result);
702 free(list);
703 list = next;
705 return result;
708 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
710 struct commit_list *i, *j, *k, *ret = NULL;
711 struct commit_list **pptr = &ret;
713 for (i = in; i; i = i->next) {
714 if (!ret)
715 pptr = &commit_list_insert(i->item, pptr)->next;
716 else {
717 struct commit_list *new = NULL, *end = NULL;
719 for (j = ret; j; j = j->next) {
720 struct commit_list *bases;
721 bases = get_merge_bases(i->item, j->item, 1);
722 if (!new)
723 new = bases;
724 else
725 end->next = bases;
726 for (k = bases; k; k = k->next)
727 end = k;
729 ret = new;
732 return ret;
735 static int remove_redundant(struct commit **array, int cnt)
738 * Some commit in the array may be an ancestor of
739 * another commit. Move such commit to the end of
740 * the array, and return the number of commits that
741 * are independent from each other.
743 struct commit **work;
744 unsigned char *redundant;
745 int *filled_index;
746 int i, j, filled;
748 work = xcalloc(cnt, sizeof(*work));
749 redundant = xcalloc(cnt, 1);
750 filled_index = xmalloc(sizeof(*filled_index) * (cnt - 1));
752 for (i = 0; i < cnt; i++)
753 parse_commit(array[i]);
754 for (i = 0; i < cnt; i++) {
755 struct commit_list *common;
757 if (redundant[i])
758 continue;
759 for (j = filled = 0; j < cnt; j++) {
760 if (i == j || redundant[j])
761 continue;
762 filled_index[filled] = j;
763 work[filled++] = array[j];
765 common = paint_down_to_common(array[i], filled, work);
766 if (array[i]->object.flags & PARENT2)
767 redundant[i] = 1;
768 for (j = 0; j < filled; j++)
769 if (work[j]->object.flags & PARENT1)
770 redundant[filled_index[j]] = 1;
771 clear_commit_marks(array[i], all_flags);
772 for (j = 0; j < filled; j++)
773 clear_commit_marks(work[j], all_flags);
774 free_commit_list(common);
777 /* Now collect the result */
778 memcpy(work, array, sizeof(*array) * cnt);
779 for (i = filled = 0; i < cnt; i++)
780 if (!redundant[i])
781 array[filled++] = work[i];
782 for (j = filled, i = 0; i < cnt; i++)
783 if (redundant[i])
784 array[j++] = work[i];
785 free(work);
786 free(redundant);
787 free(filled_index);
788 return filled;
791 struct commit_list *get_merge_bases_many(struct commit *one,
792 int n,
793 struct commit **twos,
794 int cleanup)
796 struct commit_list *list;
797 struct commit **rslt;
798 struct commit_list *result;
799 int cnt, i;
801 result = merge_bases_many(one, n, twos);
802 for (i = 0; i < n; i++) {
803 if (one == twos[i])
804 return result;
806 if (!result || !result->next) {
807 if (cleanup) {
808 clear_commit_marks(one, all_flags);
809 clear_commit_marks_many(n, twos, all_flags);
811 return result;
814 /* There are more than one */
815 cnt = 0;
816 list = result;
817 while (list) {
818 list = list->next;
819 cnt++;
821 rslt = xcalloc(cnt, sizeof(*rslt));
822 for (list = result, i = 0; list; list = list->next)
823 rslt[i++] = list->item;
824 free_commit_list(result);
826 clear_commit_marks(one, all_flags);
827 clear_commit_marks_many(n, twos, all_flags);
829 cnt = remove_redundant(rslt, cnt);
830 result = NULL;
831 for (i = 0; i < cnt; i++)
832 commit_list_insert_by_date(rslt[i], &result);
833 free(rslt);
834 return result;
837 struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
838 int cleanup)
840 return get_merge_bases_many(one, 1, &two, cleanup);
844 * Is "commit" a decendant of one of the elements on the "with_commit" list?
846 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
848 if (!with_commit)
849 return 1;
850 while (with_commit) {
851 struct commit *other;
853 other = with_commit->item;
854 with_commit = with_commit->next;
855 if (in_merge_bases(other, commit))
856 return 1;
858 return 0;
862 * Is "commit" an ancestor of one of the "references"?
864 int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
866 struct commit_list *bases;
867 int ret = 0, i;
869 if (parse_commit(commit))
870 return ret;
871 for (i = 0; i < nr_reference; i++)
872 if (parse_commit(reference[i]))
873 return ret;
875 bases = paint_down_to_common(commit, nr_reference, reference);
876 if (commit->object.flags & PARENT2)
877 ret = 1;
878 clear_commit_marks(commit, all_flags);
879 clear_commit_marks_many(nr_reference, reference, all_flags);
880 free_commit_list(bases);
881 return ret;
885 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
887 int in_merge_bases(struct commit *commit, struct commit *reference)
889 return in_merge_bases_many(commit, 1, &reference);
892 struct commit_list *reduce_heads(struct commit_list *heads)
894 struct commit_list *p;
895 struct commit_list *result = NULL, **tail = &result;
896 struct commit **array;
897 int num_head, i;
899 if (!heads)
900 return NULL;
902 /* Uniquify */
903 for (p = heads; p; p = p->next)
904 p->item->object.flags &= ~STALE;
905 for (p = heads, num_head = 0; p; p = p->next) {
906 if (p->item->object.flags & STALE)
907 continue;
908 p->item->object.flags |= STALE;
909 num_head++;
911 array = xcalloc(sizeof(*array), num_head);
912 for (p = heads, i = 0; p; p = p->next) {
913 if (p->item->object.flags & STALE) {
914 array[i++] = p->item;
915 p->item->object.flags &= ~STALE;
918 num_head = remove_redundant(array, num_head);
919 for (i = 0; i < num_head; i++)
920 tail = &commit_list_insert(array[i], tail)->next;
921 return result;
924 static const char gpg_sig_header[] = "gpgsig";
925 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
927 static int do_sign_commit(struct strbuf *buf, const char *keyid)
929 struct strbuf sig = STRBUF_INIT;
930 int inspos, copypos;
932 /* find the end of the header */
933 inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
935 if (!keyid || !*keyid)
936 keyid = get_signing_key();
937 if (sign_buffer(buf, &sig, keyid)) {
938 strbuf_release(&sig);
939 return -1;
942 for (copypos = 0; sig.buf[copypos]; ) {
943 const char *bol = sig.buf + copypos;
944 const char *eol = strchrnul(bol, '\n');
945 int len = (eol - bol) + !!*eol;
947 if (!copypos) {
948 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
949 inspos += gpg_sig_header_len;
951 strbuf_insert(buf, inspos++, " ", 1);
952 strbuf_insert(buf, inspos, bol, len);
953 inspos += len;
954 copypos += len;
956 strbuf_release(&sig);
957 return 0;
960 int parse_signed_commit(const unsigned char *sha1,
961 struct strbuf *payload, struct strbuf *signature)
963 unsigned long size;
964 enum object_type type;
965 char *buffer = read_sha1_file(sha1, &type, &size);
966 int in_signature, saw_signature = -1;
967 char *line, *tail;
969 if (!buffer || type != OBJ_COMMIT)
970 goto cleanup;
972 line = buffer;
973 tail = buffer + size;
974 in_signature = 0;
975 saw_signature = 0;
976 while (line < tail) {
977 const char *sig = NULL;
978 char *next = memchr(line, '\n', tail - line);
980 next = next ? next + 1 : tail;
981 if (in_signature && line[0] == ' ')
982 sig = line + 1;
983 else if (!prefixcmp(line, gpg_sig_header) &&
984 line[gpg_sig_header_len] == ' ')
985 sig = line + gpg_sig_header_len + 1;
986 if (sig) {
987 strbuf_add(signature, sig, next - sig);
988 saw_signature = 1;
989 in_signature = 1;
990 } else {
991 if (*line == '\n')
992 /* dump the whole remainder of the buffer */
993 next = tail;
994 strbuf_add(payload, line, next - line);
995 in_signature = 0;
997 line = next;
999 cleanup:
1000 free(buffer);
1001 return saw_signature;
1004 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1006 struct merge_remote_desc *desc;
1007 struct commit_extra_header *mergetag;
1008 char *buf;
1009 unsigned long size, len;
1010 enum object_type type;
1012 desc = merge_remote_util(parent);
1013 if (!desc || !desc->obj)
1014 return;
1015 buf = read_sha1_file(desc->obj->sha1, &type, &size);
1016 if (!buf || type != OBJ_TAG)
1017 goto free_return;
1018 len = parse_signature(buf, size);
1019 if (size == len)
1020 goto free_return;
1022 * We could verify this signature and either omit the tag when
1023 * it does not validate, but the integrator may not have the
1024 * public key of the signer of the tag he is merging, while a
1025 * later auditor may have it while auditing, so let's not run
1026 * verify-signed-buffer here for now...
1028 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1029 * warn("warning: signed tag unverified.");
1031 mergetag = xcalloc(1, sizeof(*mergetag));
1032 mergetag->key = xstrdup("mergetag");
1033 mergetag->value = buf;
1034 mergetag->len = size;
1036 **tail = mergetag;
1037 *tail = &mergetag->next;
1038 return;
1040 free_return:
1041 free(buf);
1044 static struct {
1045 char result;
1046 const char *check;
1047 } sigcheck_gpg_status[] = {
1048 { 'G', "\n[GNUPG:] GOODSIG " },
1049 { 'B', "\n[GNUPG:] BADSIG " },
1050 { 'U', "\n[GNUPG:] TRUST_NEVER" },
1051 { 'U', "\n[GNUPG:] TRUST_UNDEFINED" },
1054 static void parse_gpg_output(struct signature_check *sigc)
1056 const char *buf = sigc->gpg_status;
1057 int i;
1059 /* Iterate over all search strings */
1060 for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
1061 const char *found, *next;
1063 if (!prefixcmp(buf, sigcheck_gpg_status[i].check + 1)) {
1064 /* At the very beginning of the buffer */
1065 found = buf + strlen(sigcheck_gpg_status[i].check + 1);
1066 } else {
1067 found = strstr(buf, sigcheck_gpg_status[i].check);
1068 if (!found)
1069 continue;
1070 found += strlen(sigcheck_gpg_status[i].check);
1072 sigc->result = sigcheck_gpg_status[i].result;
1073 /* The trust messages are not followed by key/signer information */
1074 if (sigc->result != 'U') {
1075 sigc->key = xmemdupz(found, 16);
1076 found += 17;
1077 next = strchrnul(found, '\n');
1078 sigc->signer = xmemdupz(found, next - found);
1083 void check_commit_signature(const struct commit* commit, struct signature_check *sigc)
1085 struct strbuf payload = STRBUF_INIT;
1086 struct strbuf signature = STRBUF_INIT;
1087 struct strbuf gpg_output = STRBUF_INIT;
1088 struct strbuf gpg_status = STRBUF_INIT;
1089 int status;
1091 sigc->result = 'N';
1093 if (parse_signed_commit(commit->object.sha1,
1094 &payload, &signature) <= 0)
1095 goto out;
1096 status = verify_signed_buffer(payload.buf, payload.len,
1097 signature.buf, signature.len,
1098 &gpg_output, &gpg_status);
1099 if (status && !gpg_output.len)
1100 goto out;
1101 sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
1102 sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
1103 parse_gpg_output(sigc);
1105 out:
1106 strbuf_release(&gpg_status);
1107 strbuf_release(&gpg_output);
1108 strbuf_release(&payload);
1109 strbuf_release(&signature);
1114 void append_merge_tag_headers(struct commit_list *parents,
1115 struct commit_extra_header ***tail)
1117 while (parents) {
1118 struct commit *parent = parents->item;
1119 handle_signed_tag(parent, tail);
1120 parents = parents->next;
1124 static void add_extra_header(struct strbuf *buffer,
1125 struct commit_extra_header *extra)
1127 strbuf_addstr(buffer, extra->key);
1128 if (extra->len)
1129 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1130 else
1131 strbuf_addch(buffer, '\n');
1134 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1135 const char **exclude)
1137 struct commit_extra_header *extra = NULL;
1138 unsigned long size;
1139 enum object_type type;
1140 char *buffer = read_sha1_file(commit->object.sha1, &type, &size);
1141 if (buffer && type == OBJ_COMMIT)
1142 extra = read_commit_extra_header_lines(buffer, size, exclude);
1143 free(buffer);
1144 return extra;
1147 static inline int standard_header_field(const char *field, size_t len)
1149 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
1150 (len == 6 && !memcmp(field, "parent ", 7)) ||
1151 (len == 6 && !memcmp(field, "author ", 7)) ||
1152 (len == 9 && !memcmp(field, "committer ", 10)) ||
1153 (len == 8 && !memcmp(field, "encoding ", 9)));
1156 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1158 if (!exclude)
1159 return 0;
1161 while (*exclude) {
1162 size_t xlen = strlen(*exclude);
1163 if (len == xlen &&
1164 !memcmp(field, *exclude, xlen) && field[xlen] == ' ')
1165 return 1;
1166 exclude++;
1168 return 0;
1171 static struct commit_extra_header *read_commit_extra_header_lines(
1172 const char *buffer, size_t size,
1173 const char **exclude)
1175 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1176 const char *line, *next, *eof, *eob;
1177 struct strbuf buf = STRBUF_INIT;
1179 for (line = buffer, eob = line + size;
1180 line < eob && *line != '\n';
1181 line = next) {
1182 next = memchr(line, '\n', eob - line);
1183 next = next ? next + 1 : eob;
1184 if (*line == ' ') {
1185 /* continuation */
1186 if (it)
1187 strbuf_add(&buf, line + 1, next - (line + 1));
1188 continue;
1190 if (it)
1191 it->value = strbuf_detach(&buf, &it->len);
1192 strbuf_reset(&buf);
1193 it = NULL;
1195 eof = strchr(line, ' ');
1196 if (next <= eof)
1197 eof = next;
1199 if (standard_header_field(line, eof - line) ||
1200 excluded_header_field(line, eof - line, exclude))
1201 continue;
1203 it = xcalloc(1, sizeof(*it));
1204 it->key = xmemdupz(line, eof-line);
1205 *tail = it;
1206 tail = &it->next;
1207 if (eof + 1 < next)
1208 strbuf_add(&buf, eof + 1, next - (eof + 1));
1210 if (it)
1211 it->value = strbuf_detach(&buf, &it->len);
1212 return extra;
1215 void free_commit_extra_headers(struct commit_extra_header *extra)
1217 while (extra) {
1218 struct commit_extra_header *next = extra->next;
1219 free(extra->key);
1220 free(extra->value);
1221 free(extra);
1222 extra = next;
1226 int commit_tree(const struct strbuf *msg, unsigned char *tree,
1227 struct commit_list *parents, unsigned char *ret,
1228 const char *author, const char *sign_commit)
1230 struct commit_extra_header *extra = NULL, **tail = &extra;
1231 int result;
1233 append_merge_tag_headers(parents, &tail);
1234 result = commit_tree_extended(msg, tree, parents, ret,
1235 author, sign_commit, extra);
1236 free_commit_extra_headers(extra);
1237 return result;
1240 static int find_invalid_utf8(const char *buf, int len)
1242 int offset = 0;
1244 while (len) {
1245 unsigned char c = *buf++;
1246 int bytes, bad_offset;
1248 len--;
1249 offset++;
1251 /* Simple US-ASCII? No worries. */
1252 if (c < 0x80)
1253 continue;
1255 bad_offset = offset-1;
1258 * Count how many more high bits set: that's how
1259 * many more bytes this sequence should have.
1261 bytes = 0;
1262 while (c & 0x40) {
1263 c <<= 1;
1264 bytes++;
1267 /* Must be between 1 and 5 more bytes */
1268 if (bytes < 1 || bytes > 5)
1269 return bad_offset;
1271 /* Do we *have* that many bytes? */
1272 if (len < bytes)
1273 return bad_offset;
1275 offset += bytes;
1276 len -= bytes;
1278 /* And verify that they are good continuation bytes */
1279 do {
1280 if ((*buf++ & 0xc0) != 0x80)
1281 return bad_offset;
1282 } while (--bytes);
1284 /* We could/should check the value and length here too */
1286 return -1;
1290 * This verifies that the buffer is in proper utf8 format.
1292 * If it isn't, it assumes any non-utf8 characters are Latin1,
1293 * and does the conversion.
1295 * Fixme: we should probably also disallow overlong forms and
1296 * invalid characters. But we don't do that currently.
1298 static int verify_utf8(struct strbuf *buf)
1300 int ok = 1;
1301 long pos = 0;
1303 for (;;) {
1304 int bad;
1305 unsigned char c;
1306 unsigned char replace[2];
1308 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1309 if (bad < 0)
1310 return ok;
1311 pos += bad;
1312 ok = 0;
1313 c = buf->buf[pos];
1314 strbuf_remove(buf, pos, 1);
1316 /* We know 'c' must be in the range 128-255 */
1317 replace[0] = 0xc0 + (c >> 6);
1318 replace[1] = 0x80 + (c & 0x3f);
1319 strbuf_insert(buf, pos, replace, 2);
1320 pos += 2;
1324 static const char commit_utf8_warn[] =
1325 "Warning: commit message did not conform to UTF-8.\n"
1326 "You may want to amend it after fixing the message, or set the config\n"
1327 "variable i18n.commitencoding to the encoding your project uses.\n";
1329 int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
1330 struct commit_list *parents, unsigned char *ret,
1331 const char *author, const char *sign_commit,
1332 struct commit_extra_header *extra)
1334 int result;
1335 int encoding_is_utf8;
1336 struct strbuf buffer;
1338 assert_sha1_type(tree, OBJ_TREE);
1340 if (memchr(msg->buf, '\0', msg->len))
1341 return error("a NUL byte in commit log message not allowed.");
1343 /* Not having i18n.commitencoding is the same as having utf-8 */
1344 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1346 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1347 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1350 * NOTE! This ordering means that the same exact tree merged with a
1351 * different order of parents will be a _different_ changeset even
1352 * if everything else stays the same.
1354 while (parents) {
1355 struct commit_list *next = parents->next;
1356 struct commit *parent = parents->item;
1358 strbuf_addf(&buffer, "parent %s\n",
1359 sha1_to_hex(parent->object.sha1));
1360 free(parents);
1361 parents = next;
1364 /* Person/date information */
1365 if (!author)
1366 author = git_author_info(IDENT_STRICT);
1367 strbuf_addf(&buffer, "author %s\n", author);
1368 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1369 if (!encoding_is_utf8)
1370 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1372 while (extra) {
1373 add_extra_header(&buffer, extra);
1374 extra = extra->next;
1376 strbuf_addch(&buffer, '\n');
1378 /* And add the comment */
1379 strbuf_addbuf(&buffer, msg);
1381 /* And check the encoding */
1382 if (encoding_is_utf8 && !verify_utf8(&buffer))
1383 fprintf(stderr, commit_utf8_warn);
1385 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1386 return -1;
1388 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1389 strbuf_release(&buffer);
1390 return result;
1393 struct commit *get_merge_parent(const char *name)
1395 struct object *obj;
1396 struct commit *commit;
1397 unsigned char sha1[20];
1398 if (get_sha1(name, sha1))
1399 return NULL;
1400 obj = parse_object(sha1);
1401 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1402 if (commit && !commit->util) {
1403 struct merge_remote_desc *desc;
1404 desc = xmalloc(sizeof(*desc));
1405 desc->obj = obj;
1406 desc->name = strdup(name);
1407 commit->util = desc;
1409 return commit;
1413 * Append a commit to the end of the commit_list.
1415 * next starts by pointing to the variable that holds the head of an
1416 * empty commit_list, and is updated to point to the "next" field of
1417 * the last item on the list as new commits are appended.
1419 * Usage example:
1421 * struct commit_list *list;
1422 * struct commit_list **next = &list;
1424 * next = commit_list_append(c1, next);
1425 * next = commit_list_append(c2, next);
1426 * assert(commit_list_count(list) == 2);
1427 * return list;
1429 struct commit_list **commit_list_append(struct commit *commit,
1430 struct commit_list **next)
1432 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1433 new->item = commit;
1434 *next = new;
1435 new->next = NULL;
1436 return &new->next;
1439 void print_commit_list(struct commit_list *list,
1440 const char *format_cur,
1441 const char *format_last)
1443 for ( ; list; list = list->next) {
1444 const char *format = list->next ? format_cur : format_last;
1445 printf(format, sha1_to_hex(list->item->object.sha1));