9 #include "gpg-interface.h"
11 int save_commit_buffer = 1;
13 const char *commit_type = "commit";
15 static struct commit *check_commit(struct object *obj,
16 const unsigned char *sha1,
19 if (obj->type != OBJ_COMMIT) {
21 error("Object %s is a %s, not a commit",
22 sha1_to_hex(sha1), typename(obj->type));
25 return (struct commit *) obj;
28 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
31 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
35 return check_commit(obj, sha1, quiet);
38 struct commit *lookup_commit_reference(const unsigned char *sha1)
40 return lookup_commit_reference_gently(sha1, 0);
43 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
45 struct commit *c = lookup_commit_reference(sha1);
47 die(_("could not parse %s"), ref_name);
48 if (hashcmp(sha1, c->object.sha1)) {
49 warning(_("%s %s is not a commit!"),
50 ref_name, sha1_to_hex(sha1));
55 struct commit *lookup_commit(const unsigned char *sha1)
57 struct object *obj = lookup_object(sha1);
59 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
61 obj->type = OBJ_COMMIT;
62 return check_commit(obj, sha1, 0);
65 struct commit *lookup_commit_reference_by_name(const char *name)
67 unsigned char sha1[20];
68 struct commit *commit;
70 if (get_sha1(name, sha1))
72 commit = lookup_commit_reference(sha1);
73 if (!commit || parse_commit(commit))
78 static unsigned long parse_commit_date(const char *buf, const char *tail)
84 if (memcmp(buf, "author", 6))
86 while (buf < tail && *buf++ != '\n')
90 if (memcmp(buf, "committer", 9))
92 while (buf < tail && *buf++ != '>')
97 while (buf < tail && *buf++ != '\n')
101 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
102 return strtoul(dateptr, NULL, 10);
105 static struct commit_graft **commit_graft;
106 static int commit_graft_alloc, commit_graft_nr;
108 static int commit_graft_pos(const unsigned char *sha1)
112 hi = commit_graft_nr;
114 int mi = (lo + hi) / 2;
115 struct commit_graft *graft = commit_graft[mi];
116 int cmp = hashcmp(sha1, graft->sha1);
127 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
129 int pos = commit_graft_pos(graft->sha1);
135 free(commit_graft[pos]);
136 commit_graft[pos] = graft;
141 if (commit_graft_alloc <= ++commit_graft_nr) {
142 commit_graft_alloc = alloc_nr(commit_graft_alloc);
143 commit_graft = xrealloc(commit_graft,
144 sizeof(*commit_graft) *
147 if (pos < commit_graft_nr)
148 memmove(commit_graft + pos + 1,
150 (commit_graft_nr - pos - 1) *
151 sizeof(*commit_graft));
152 commit_graft[pos] = graft;
156 struct commit_graft *read_graft_line(char *buf, int len)
158 /* The format is just "Commit Parent1 Parent2 ...\n" */
160 struct commit_graft *graft = NULL;
162 while (len && isspace(buf[len-1]))
164 if (buf[0] == '#' || buf[0] == '\0')
168 i = (len + 1) / 41 - 1;
169 graft = xmalloc(sizeof(*graft) + 20 * i);
170 graft->nr_parent = i;
171 if (get_sha1_hex(buf, graft->sha1))
173 for (i = 40; i < len; i += 41) {
176 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
182 error("bad graft data: %s", buf);
187 static int read_graft_file(const char *graft_file)
189 FILE *fp = fopen(graft_file, "r");
193 while (fgets(buf, sizeof(buf), fp)) {
194 /* The format is just "Commit Parent1 Parent2 ...\n" */
195 int len = strlen(buf);
196 struct commit_graft *graft = read_graft_line(buf, len);
199 if (register_commit_graft(graft, 1))
200 error("duplicate graft data: %s", buf);
206 static void prepare_commit_graft(void)
208 static int commit_graft_prepared;
211 if (commit_graft_prepared)
213 graft_file = get_graft_file();
214 read_graft_file(graft_file);
215 /* make sure shallows are read */
216 is_repository_shallow();
217 commit_graft_prepared = 1;
220 struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
223 prepare_commit_graft();
224 pos = commit_graft_pos(sha1);
227 return commit_graft[pos];
230 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
233 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
234 ret = fn(commit_graft[i], cb_data);
238 int unregister_shallow(const unsigned char *sha1)
240 int pos = commit_graft_pos(sha1);
243 if (pos + 1 < commit_graft_nr)
244 memmove(commit_graft + pos, commit_graft + pos + 1,
245 sizeof(struct commit_graft *)
246 * (commit_graft_nr - pos - 1));
251 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
253 const char *tail = buffer;
254 const char *bufptr = buffer;
255 unsigned char parent[20];
256 struct commit_list **pptr;
257 struct commit_graft *graft;
259 if (item->object.parsed)
261 item->object.parsed = 1;
263 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
264 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
265 if (get_sha1_hex(bufptr + 5, parent) < 0)
266 return error("bad tree pointer in commit %s",
267 sha1_to_hex(item->object.sha1));
268 item->tree = lookup_tree(parent);
269 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
270 pptr = &item->parents;
272 graft = lookup_commit_graft(item->object.sha1);
273 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
274 struct commit *new_parent;
276 if (tail <= bufptr + 48 ||
277 get_sha1_hex(bufptr + 7, parent) ||
279 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
282 * The clone is shallow if nr_parent < 0, and we must
283 * not traverse its real parents even when we unhide them.
285 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
287 new_parent = lookup_commit(parent);
289 pptr = &commit_list_insert(new_parent, pptr)->next;
293 struct commit *new_parent;
294 for (i = 0; i < graft->nr_parent; i++) {
295 new_parent = lookup_commit(graft->parent[i]);
298 pptr = &commit_list_insert(new_parent, pptr)->next;
301 item->date = parse_commit_date(bufptr, tail);
306 int parse_commit(struct commit *item)
308 enum object_type type;
315 if (item->object.parsed)
317 buffer = read_sha1_file(item->object.sha1, &type, &size);
319 return error("Could not read %s",
320 sha1_to_hex(item->object.sha1));
321 if (type != OBJ_COMMIT) {
323 return error("Object %s not a commit",
324 sha1_to_hex(item->object.sha1));
326 ret = parse_commit_buffer(item, buffer, size);
327 if (save_commit_buffer && !ret) {
328 item->buffer = buffer;
335 int find_commit_subject(const char *commit_buffer, const char **subject)
338 const char *p = commit_buffer;
340 while (*p && (*p != '\n' || p[1] != '\n'))
344 for (eol = p; *eol && *eol != '\n'; eol++)
354 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
356 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
357 new_list->item = item;
358 new_list->next = *list_p;
363 unsigned commit_list_count(const struct commit_list *l)
366 for (; l; l = l->next )
371 void free_commit_list(struct commit_list *list)
374 struct commit_list *temp = list;
380 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
382 struct commit_list **pp = list;
383 struct commit_list *p;
384 while ((p = *pp) != NULL) {
385 if (p->item->date < item->date) {
390 return commit_list_insert(item, pp);
394 void commit_list_sort_by_date(struct commit_list **list)
396 struct commit_list *ret = NULL;
398 commit_list_insert_by_date((*list)->item, &ret);
399 *list = (*list)->next;
404 struct commit *pop_most_recent_commit(struct commit_list **list,
407 struct commit *ret = (*list)->item;
408 struct commit_list *parents = ret->parents;
409 struct commit_list *old = *list;
411 *list = (*list)->next;
415 struct commit *commit = parents->item;
416 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
417 commit->object.flags |= mark;
418 commit_list_insert_by_date(commit, list);
420 parents = parents->next;
425 void clear_commit_marks(struct commit *commit, unsigned int mark)
428 struct commit_list *parents;
430 if (!(mark & commit->object.flags))
433 commit->object.flags &= ~mark;
435 parents = commit->parents;
439 while ((parents = parents->next))
440 clear_commit_marks(parents->item, mark);
442 commit = commit->parents->item;
446 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
448 struct object *object;
449 struct commit *commit;
452 for (i = 0; i < a->nr; i++) {
453 object = a->objects[i].item;
454 commit = lookup_commit_reference_gently(object->sha1, 1);
456 clear_commit_marks(commit, mark);
460 struct commit *pop_commit(struct commit_list **stack)
462 struct commit_list *top = *stack;
463 struct commit *item = top ? top->item : NULL;
473 * Performs an in-place topological sort on the list supplied.
475 void sort_in_topological_order(struct commit_list ** list, int lifo)
477 struct commit_list *next, *orig = *list;
478 struct commit_list *work, **insert;
479 struct commit_list **pptr;
485 /* Mark them and clear the indegree */
486 for (next = orig; next; next = next->next) {
487 struct commit *commit = next->item;
488 commit->indegree = 1;
491 /* update the indegree */
492 for (next = orig; next; next = next->next) {
493 struct commit_list * parents = next->item->parents;
495 struct commit *parent = parents->item;
497 if (parent->indegree)
499 parents = parents->next;
506 * tips are nodes not reachable from any other node in the list
508 * the tips serve as a starting set for the work queue.
512 for (next = orig; next; next = next->next) {
513 struct commit *commit = next->item;
515 if (commit->indegree == 1)
516 insert = &commit_list_insert(commit, insert)->next;
519 /* process the list in topological order */
521 commit_list_sort_by_date(&work);
526 struct commit *commit;
527 struct commit_list *parents, *work_item;
530 work = work_item->next;
531 work_item->next = NULL;
533 commit = work_item->item;
534 for (parents = commit->parents; parents ; parents = parents->next) {
535 struct commit *parent = parents->item;
537 if (!parent->indegree)
541 * parents are only enqueued for emission
542 * when all their children have been emitted thereby
543 * guaranteeing topological order.
545 if (--parent->indegree == 1) {
547 commit_list_insert_by_date(parent, &work);
549 commit_list_insert(parent, &work);
553 * work_item is a commit all of whose children
554 * have already been emitted. we can emit it now.
556 commit->indegree = 0;
558 pptr = &work_item->next;
562 /* merge-base stuff */
564 /* bits #0..15 in revision.h */
565 #define PARENT1 (1u<<16)
566 #define PARENT2 (1u<<17)
567 #define STALE (1u<<18)
568 #define RESULT (1u<<19)
570 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
572 static struct commit *interesting(struct commit_list *list)
575 struct commit *commit = list->item;
577 if (commit->object.flags & STALE)
584 /* all input commits in one and twos[] must have been parsed! */
585 static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
587 struct commit_list *list = NULL;
588 struct commit_list *result = NULL;
591 one->object.flags |= PARENT1;
592 commit_list_insert_by_date(one, &list);
595 for (i = 0; i < n; i++) {
596 twos[i]->object.flags |= PARENT2;
597 commit_list_insert_by_date(twos[i], &list);
600 while (interesting(list)) {
601 struct commit *commit;
602 struct commit_list *parents;
603 struct commit_list *next;
611 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
612 if (flags == (PARENT1 | PARENT2)) {
613 if (!(commit->object.flags & RESULT)) {
614 commit->object.flags |= RESULT;
615 commit_list_insert_by_date(commit, &result);
617 /* Mark parents of a found merge stale */
620 parents = commit->parents;
622 struct commit *p = parents->item;
623 parents = parents->next;
624 if ((p->object.flags & flags) == flags)
628 p->object.flags |= flags;
629 commit_list_insert_by_date(p, &list);
633 free_commit_list(list);
637 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
639 struct commit_list *list = NULL;
640 struct commit_list *result = NULL;
643 for (i = 0; i < n; i++) {
646 * We do not mark this even with RESULT so we do not
647 * have to clean it up.
649 return commit_list_insert(one, &result);
652 if (parse_commit(one))
654 for (i = 0; i < n; i++) {
655 if (parse_commit(twos[i]))
659 list = paint_down_to_common(one, n, twos);
662 struct commit_list *next = list->next;
663 if (!(list->item->object.flags & STALE))
664 commit_list_insert_by_date(list->item, &result);
671 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
673 struct commit_list *i, *j, *k, *ret = NULL;
674 struct commit_list **pptr = &ret;
676 for (i = in; i; i = i->next) {
678 pptr = &commit_list_insert(i->item, pptr)->next;
680 struct commit_list *new = NULL, *end = NULL;
682 for (j = ret; j; j = j->next) {
683 struct commit_list *bases;
684 bases = get_merge_bases(i->item, j->item, 1);
689 for (k = bases; k; k = k->next)
698 static int remove_redundant(struct commit **array, int cnt)
701 * Some commit in the array may be an ancestor of
702 * another commit. Move such commit to the end of
703 * the array, and return the number of commits that
704 * are independent from each other.
706 struct commit **work;
707 unsigned char *redundant;
711 work = xcalloc(cnt, sizeof(*work));
712 redundant = xcalloc(cnt, 1);
713 filled_index = xmalloc(sizeof(*filled_index) * (cnt - 1));
715 for (i = 0; i < cnt; i++)
716 parse_commit(array[i]);
717 for (i = 0; i < cnt; i++) {
718 struct commit_list *common;
722 for (j = filled = 0; j < cnt; j++) {
723 if (i == j || redundant[j])
725 filled_index[filled] = j;
726 work[filled++] = array[j];
728 common = paint_down_to_common(array[i], filled, work);
729 if (array[i]->object.flags & PARENT2)
731 for (j = 0; j < filled; j++)
732 if (work[j]->object.flags & PARENT1)
733 redundant[filled_index[j]] = 1;
734 clear_commit_marks(array[i], all_flags);
735 for (j = 0; j < filled; j++)
736 clear_commit_marks(work[j], all_flags);
737 free_commit_list(common);
740 /* Now collect the result */
741 memcpy(work, array, sizeof(*array) * cnt);
742 for (i = filled = 0; i < cnt; i++)
744 array[filled++] = work[i];
745 for (j = filled, i = 0; i < cnt; i++)
747 array[j++] = work[i];
754 struct commit_list *get_merge_bases_many(struct commit *one,
756 struct commit **twos,
759 struct commit_list *list;
760 struct commit **rslt;
761 struct commit_list *result;
764 result = merge_bases_many(one, n, twos);
765 for (i = 0; i < n; i++) {
769 if (!result || !result->next) {
771 clear_commit_marks(one, all_flags);
772 for (i = 0; i < n; i++)
773 clear_commit_marks(twos[i], all_flags);
778 /* There are more than one */
785 rslt = xcalloc(cnt, sizeof(*rslt));
786 for (list = result, i = 0; list; list = list->next)
787 rslt[i++] = list->item;
788 free_commit_list(result);
790 clear_commit_marks(one, all_flags);
791 for (i = 0; i < n; i++)
792 clear_commit_marks(twos[i], all_flags);
794 cnt = remove_redundant(rslt, cnt);
796 for (i = 0; i < cnt; i++)
797 commit_list_insert_by_date(rslt[i], &result);
802 struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
805 return get_merge_bases_many(one, 1, &two, cleanup);
809 * Is "commit" a decendant of one of the elements on the "with_commit" list?
811 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
815 while (with_commit) {
816 struct commit *other;
818 other = with_commit->item;
819 with_commit = with_commit->next;
820 if (in_merge_bases(other, commit))
827 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
829 int in_merge_bases(struct commit *commit, struct commit *reference)
831 struct commit_list *bases;
834 if (parse_commit(commit) || parse_commit(reference))
837 bases = paint_down_to_common(commit, 1, &reference);
838 if (commit->object.flags & PARENT2)
840 clear_commit_marks(commit, all_flags);
841 clear_commit_marks(reference, all_flags);
842 free_commit_list(bases);
846 struct commit_list *reduce_heads(struct commit_list *heads)
848 struct commit_list *p;
849 struct commit_list *result = NULL, **tail = &result;
850 struct commit **array;
857 for (p = heads; p; p = p->next)
858 p->item->object.flags &= ~STALE;
859 for (p = heads, num_head = 0; p; p = p->next) {
860 if (p->item->object.flags & STALE)
862 p->item->object.flags |= STALE;
865 array = xcalloc(sizeof(*array), num_head);
866 for (p = heads, i = 0; p; p = p->next) {
867 if (p->item->object.flags & STALE) {
868 array[i++] = p->item;
869 p->item->object.flags &= ~STALE;
872 num_head = remove_redundant(array, num_head);
873 for (i = 0; i < num_head; i++)
874 tail = &commit_list_insert(array[i], tail)->next;
878 static const char gpg_sig_header[] = "gpgsig";
879 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
881 static int do_sign_commit(struct strbuf *buf, const char *keyid)
883 struct strbuf sig = STRBUF_INIT;
886 /* find the end of the header */
887 inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
889 if (!keyid || !*keyid)
890 keyid = get_signing_key();
891 if (sign_buffer(buf, &sig, keyid)) {
892 strbuf_release(&sig);
896 for (copypos = 0; sig.buf[copypos]; ) {
897 const char *bol = sig.buf + copypos;
898 const char *eol = strchrnul(bol, '\n');
899 int len = (eol - bol) + !!*eol;
902 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
903 inspos += gpg_sig_header_len;
905 strbuf_insert(buf, inspos++, " ", 1);
906 strbuf_insert(buf, inspos, bol, len);
910 strbuf_release(&sig);
914 int parse_signed_commit(const unsigned char *sha1,
915 struct strbuf *payload, struct strbuf *signature)
918 enum object_type type;
919 char *buffer = read_sha1_file(sha1, &type, &size);
920 int in_signature, saw_signature = -1;
923 if (!buffer || type != OBJ_COMMIT)
927 tail = buffer + size;
930 while (line < tail) {
931 const char *sig = NULL;
932 char *next = memchr(line, '\n', tail - line);
934 next = next ? next + 1 : tail;
935 if (in_signature && line[0] == ' ')
937 else if (!prefixcmp(line, gpg_sig_header) &&
938 line[gpg_sig_header_len] == ' ')
939 sig = line + gpg_sig_header_len + 1;
941 strbuf_add(signature, sig, next - sig);
946 /* dump the whole remainder of the buffer */
948 strbuf_add(payload, line, next - line);
955 return saw_signature;
958 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
960 struct merge_remote_desc *desc;
961 struct commit_extra_header *mergetag;
963 unsigned long size, len;
964 enum object_type type;
966 desc = merge_remote_util(parent);
967 if (!desc || !desc->obj)
969 buf = read_sha1_file(desc->obj->sha1, &type, &size);
970 if (!buf || type != OBJ_TAG)
972 len = parse_signature(buf, size);
976 * We could verify this signature and either omit the tag when
977 * it does not validate, but the integrator may not have the
978 * public key of the signer of the tag he is merging, while a
979 * later auditor may have it while auditing, so let's not run
980 * verify-signed-buffer here for now...
982 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
983 * warn("warning: signed tag unverified.");
985 mergetag = xcalloc(1, sizeof(*mergetag));
986 mergetag->key = xstrdup("mergetag");
987 mergetag->value = buf;
988 mergetag->len = size;
991 *tail = &mergetag->next;
998 void append_merge_tag_headers(struct commit_list *parents,
999 struct commit_extra_header ***tail)
1002 struct commit *parent = parents->item;
1003 handle_signed_tag(parent, tail);
1004 parents = parents->next;
1008 static void add_extra_header(struct strbuf *buffer,
1009 struct commit_extra_header *extra)
1011 strbuf_addstr(buffer, extra->key);
1013 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1015 strbuf_addch(buffer, '\n');
1018 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1019 const char **exclude)
1021 struct commit_extra_header *extra = NULL;
1023 enum object_type type;
1024 char *buffer = read_sha1_file(commit->object.sha1, &type, &size);
1025 if (buffer && type == OBJ_COMMIT)
1026 extra = read_commit_extra_header_lines(buffer, size, exclude);
1031 static inline int standard_header_field(const char *field, size_t len)
1033 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
1034 (len == 6 && !memcmp(field, "parent ", 7)) ||
1035 (len == 6 && !memcmp(field, "author ", 7)) ||
1036 (len == 9 && !memcmp(field, "committer ", 10)) ||
1037 (len == 8 && !memcmp(field, "encoding ", 9)));
1040 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1046 size_t xlen = strlen(*exclude);
1048 !memcmp(field, *exclude, xlen) && field[xlen] == ' ')
1055 struct commit_extra_header *read_commit_extra_header_lines(const char *buffer, size_t size,
1056 const char **exclude)
1058 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1059 const char *line, *next, *eof, *eob;
1060 struct strbuf buf = STRBUF_INIT;
1062 for (line = buffer, eob = line + size;
1063 line < eob && *line != '\n';
1065 next = memchr(line, '\n', eob - line);
1066 next = next ? next + 1 : eob;
1070 strbuf_add(&buf, line + 1, next - (line + 1));
1074 it->value = strbuf_detach(&buf, &it->len);
1078 eof = strchr(line, ' ');
1082 if (standard_header_field(line, eof - line) ||
1083 excluded_header_field(line, eof - line, exclude))
1086 it = xcalloc(1, sizeof(*it));
1087 it->key = xmemdupz(line, eof-line);
1091 strbuf_add(&buf, eof + 1, next - (eof + 1));
1094 it->value = strbuf_detach(&buf, &it->len);
1098 void free_commit_extra_headers(struct commit_extra_header *extra)
1101 struct commit_extra_header *next = extra->next;
1109 int commit_tree(const struct strbuf *msg, unsigned char *tree,
1110 struct commit_list *parents, unsigned char *ret,
1111 const char *author, const char *sign_commit)
1113 struct commit_extra_header *extra = NULL, **tail = &extra;
1116 append_merge_tag_headers(parents, &tail);
1117 result = commit_tree_extended(msg, tree, parents, ret,
1118 author, sign_commit, extra);
1119 free_commit_extra_headers(extra);
1123 static const char commit_utf8_warn[] =
1124 "Warning: commit message does not conform to UTF-8.\n"
1125 "You may want to amend it after fixing the message, or set the config\n"
1126 "variable i18n.commitencoding to the encoding your project uses.\n";
1128 int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
1129 struct commit_list *parents, unsigned char *ret,
1130 const char *author, const char *sign_commit,
1131 struct commit_extra_header *extra)
1134 int encoding_is_utf8;
1135 struct strbuf buffer;
1137 assert_sha1_type(tree, OBJ_TREE);
1139 if (memchr(msg->buf, '\0', msg->len))
1140 return error("a NUL byte in commit log message not allowed.");
1142 /* Not having i18n.commitencoding is the same as having utf-8 */
1143 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1145 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1146 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1149 * NOTE! This ordering means that the same exact tree merged with a
1150 * different order of parents will be a _different_ changeset even
1151 * if everything else stays the same.
1154 struct commit_list *next = parents->next;
1155 struct commit *parent = parents->item;
1157 strbuf_addf(&buffer, "parent %s\n",
1158 sha1_to_hex(parent->object.sha1));
1163 /* Person/date information */
1165 author = git_author_info(IDENT_ERROR_ON_NO_NAME);
1166 strbuf_addf(&buffer, "author %s\n", author);
1167 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
1168 if (!encoding_is_utf8)
1169 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1172 add_extra_header(&buffer, extra);
1173 extra = extra->next;
1175 strbuf_addch(&buffer, '\n');
1177 /* And add the comment */
1178 strbuf_addbuf(&buffer, msg);
1180 /* And check the encoding */
1181 if (encoding_is_utf8 && !is_utf8(buffer.buf))
1182 fprintf(stderr, commit_utf8_warn);
1184 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1187 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1188 strbuf_release(&buffer);
1192 struct commit *get_merge_parent(const char *name)
1195 struct commit *commit;
1196 unsigned char sha1[20];
1197 if (get_sha1(name, sha1))
1199 obj = parse_object(sha1);
1200 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1201 if (commit && !commit->util) {
1202 struct merge_remote_desc *desc;
1203 desc = xmalloc(sizeof(*desc));
1205 desc->name = strdup(name);
1206 commit->util = desc;