1#include "cache.h"
2#include "tag.h"
3#include "commit.h"
4#include "commit-graph.h"
5#include "pkt-line.h"
6#include "utf8.h"
7#include "diff.h"
8#include "revision.h"
9#include "notes.h"
10#include "gpg-interface.h"
11#include "mergesort.h"
12#include "commit-slab.h"
13#include "prio-queue.h"
14#include "sha1-lookup.h"
15#include "wt-status.h"
16static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
18int save_commit_buffer = 1;
20const char *commit_type = "commit";
22struct commit *lookup_commit_reference_gently(const struct object_id *oid,
24 int quiet)
25{
26 struct object *obj = deref_tag(parse_object(oid), NULL, 0);
27 if (!obj)
29 return NULL;
30 return object_as_type(obj, OBJ_COMMIT, quiet);
31}
32struct commit *lookup_commit_reference(const struct object_id *oid)
34{
35 return lookup_commit_reference_gently(oid, 0);
36}
37struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
39{
40 struct commit *c = lookup_commit_reference(oid);
41 if (!c)
42 die(_("could not parse %s"), ref_name);
43 if (oidcmp(oid, &c->object.oid)) {
44 warning(_("%s %s is not a commit!"),
45 ref_name, oid_to_hex(oid));
46 }
47 return c;
48}
49struct commit *lookup_commit(const struct object_id *oid)
51{
52 struct object *obj = lookup_object(oid->hash);
53 if (!obj)
54 return create_object(oid->hash, alloc_commit_node());
55 return object_as_type(obj, OBJ_COMMIT, 0);
56}
57struct commit *lookup_commit_reference_by_name(const char *name)
59{
60 struct object_id oid;
61 struct commit *commit;
62 if (get_oid_committish(name, &oid))
64 return NULL;
65 commit = lookup_commit_reference(&oid);
66 if (parse_commit(commit))
67 return NULL;
68 return commit;
69}
70static timestamp_t parse_commit_date(const char *buf, const char *tail)
72{
73 const char *dateptr;
74 if (buf + 6 >= tail)
76 return 0;
77 if (memcmp(buf, "author", 6))
78 return 0;
79 while (buf < tail && *buf++ != '\n')
80 /* nada */;
81 if (buf + 9 >= tail)
82 return 0;
83 if (memcmp(buf, "committer", 9))
84 return 0;
85 while (buf < tail && *buf++ != '>')
86 /* nada */;
87 if (buf >= tail)
88 return 0;
89 dateptr = buf;
90 while (buf < tail && *buf++ != '\n')
91 /* nada */;
92 if (buf >= tail)
93 return 0;
94 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
95 return parse_timestamp(dateptr, NULL, 10);
96}
97static struct commit_graft **commit_graft;
99static int commit_graft_alloc, commit_graft_nr;
100static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
102{
103 struct commit_graft **commit_graft_table = table;
104 return commit_graft_table[index]->oid.hash;
105}
106static int commit_graft_pos(const unsigned char *sha1)
108{
109 return sha1_pos(sha1, commit_graft, commit_graft_nr,
110 commit_graft_sha1_access);
111}
112int register_commit_graft(struct commit_graft *graft, int ignore_dups)
114{
115 int pos = commit_graft_pos(graft->oid.hash);
116 if (0 <= pos) {
118 if (ignore_dups)
119 free(graft);
120 else {
121 free(commit_graft[pos]);
122 commit_graft[pos] = graft;
123 }
124 return 1;
125 }
126 pos = -pos - 1;
127 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
128 commit_graft_nr++;
129 if (pos < commit_graft_nr)
130 MOVE_ARRAY(commit_graft + pos + 1, commit_graft + pos,
131 commit_graft_nr - pos - 1);
132 commit_graft[pos] = graft;
133 return 0;
134}
135struct commit_graft *read_graft_line(struct strbuf *line)
137{
138 /* The format is just "Commit Parent1 Parent2 ...\n" */
139 int i, phase;
140 const char *tail = NULL;
141 struct commit_graft *graft = NULL;
142 struct object_id dummy_oid, *oid;
143 strbuf_rtrim(line);
145 if (!line->len || line->buf[0] == '#')
146 return NULL;
147 /*
148 * phase 0 verifies line, counts hashes in line and allocates graft
149 * phase 1 fills graft
150 */
151 for (phase = 0; phase < 2; phase++) {
152 oid = graft ? &graft->oid : &dummy_oid;
153 if (parse_oid_hex(line->buf, oid, &tail))
154 goto bad_graft_data;
155 for (i = 0; *tail != '\0'; i++) {
156 oid = graft ? &graft->parent[i] : &dummy_oid;
157 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
158 goto bad_graft_data;
159 }
160 if (!graft) {
161 graft = xmalloc(st_add(sizeof(*graft),
162 st_mult(sizeof(struct object_id), i)));
163 graft->nr_parent = i;
164 }
165 }
166 return graft;
167bad_graft_data:
169 error("bad graft data: %s", line->buf);
170 assert(!graft);
171 return NULL;
172}
173static int read_graft_file(const char *graft_file)
175{
176 FILE *fp = fopen_or_warn(graft_file, "r");
177 struct strbuf buf = STRBUF_INIT;
178 if (!fp)
179 return -1;
180 while (!strbuf_getwholeline(&buf, fp, '\n')) {
181 /* The format is just "Commit Parent1 Parent2 ...\n" */
182 struct commit_graft *graft = read_graft_line(&buf);
183 if (!graft)
184 continue;
185 if (register_commit_graft(graft, 1))
186 error("duplicate graft data: %s", buf.buf);
187 }
188 fclose(fp);
189 strbuf_release(&buf);
190 return 0;
191}
192static void prepare_commit_graft(void)
194{
195 static int commit_graft_prepared;
196 char *graft_file;
197 if (commit_graft_prepared)
199 return;
200 graft_file = get_graft_file();
201 read_graft_file(graft_file);
202 /* make sure shallows are read */
203 is_repository_shallow();
204 commit_graft_prepared = 1;
205}
206struct commit_graft *lookup_commit_graft(const struct object_id *oid)
208{
209 int pos;
210 prepare_commit_graft();
211 pos = commit_graft_pos(oid->hash);
212 if (pos < 0)
213 return NULL;
214 return commit_graft[pos];
215}
216int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
218{
219 int i, ret;
220 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
221 ret = fn(commit_graft[i], cb_data);
222 return ret;
223}
224int unregister_shallow(const struct object_id *oid)
226{
227 int pos = commit_graft_pos(oid->hash);
228 if (pos < 0)
229 return -1;
230 if (pos + 1 < commit_graft_nr)
231 MOVE_ARRAY(commit_graft + pos, commit_graft + pos + 1,
232 commit_graft_nr - pos - 1);
233 commit_graft_nr--;
234 return 0;
235}
236struct commit_buffer {
238 void *buffer;
239 unsigned long size;
240};
241define_commit_slab(buffer_slab, struct commit_buffer);
242static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
243void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
245{
246 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
247 v->buffer = buffer;
248 v->size = size;
249}
250const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
252{
253 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
254 if (!v) {
255 if (sizep)
256 *sizep = 0;
257 return NULL;
258 }
259 if (sizep)
260 *sizep = v->size;
261 return v->buffer;
262}
263const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
265{
266 const void *ret = get_cached_commit_buffer(commit, sizep);
267 if (!ret) {
268 enum object_type type;
269 unsigned long size;
270 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
271 if (!ret)
272 die("cannot read commit object %s",
273 oid_to_hex(&commit->object.oid));
274 if (type != OBJ_COMMIT)
275 die("expected commit for %s, got %s",
276 oid_to_hex(&commit->object.oid), type_name(type));
277 if (sizep)
278 *sizep = size;
279 }
280 return ret;
281}
282void unuse_commit_buffer(const struct commit *commit, const void *buffer)
284{
285 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
286 if (!(v && v->buffer == buffer))
287 free((void *)buffer);
288}
289void free_commit_buffer(struct commit *commit)
291{
292 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
293 if (v) {
294 FREE_AND_NULL(v->buffer);
295 v->size = 0;
296 }
297}
298struct tree *get_commit_tree(const struct commit *commit)
300{
301 if (commit->maybe_tree || !commit->object.parsed)
302 return commit->maybe_tree;
303 if (commit->graph_pos == COMMIT_NOT_FROM_GRAPH)
305 BUG("commit has NULL tree, but was not loaded from commit-graph");
306 return get_commit_tree_in_graph(commit);
308}
309struct object_id *get_commit_tree_oid(const struct commit *commit)
311{
312 return &get_commit_tree(commit)->object.oid;
313}
314const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
316{
317 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
318 void *ret;
319 if (!v) {
321 if (sizep)
322 *sizep = 0;
323 return NULL;
324 }
325 ret = v->buffer;
326 if (sizep)
327 *sizep = v->size;
328 v->buffer = NULL;
330 v->size = 0;
331 return ret;
332}
333int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size, int check_graph)
335{
336 const char *tail = buffer;
337 const char *bufptr = buffer;
338 struct object_id parent;
339 struct commit_list **pptr;
340 struct commit_graft *graft;
341 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
342 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
343 if (item->object.parsed)
345 return 0;
346 item->object.parsed = 1;
347 tail += size;
348 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
349 bufptr[tree_entry_len] != '\n')
350 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
351 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
352 return error("bad tree pointer in commit %s",
353 oid_to_hex(&item->object.oid));
354 item->maybe_tree = lookup_tree(&parent);
355 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
356 pptr = &item->parents;
357 graft = lookup_commit_graft(&item->object.oid);
359 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
360 struct commit *new_parent;
361 if (tail <= bufptr + parent_entry_len + 1 ||
363 get_sha1_hex(bufptr + 7, parent.hash) ||
364 bufptr[parent_entry_len] != '\n')
365 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
366 bufptr += parent_entry_len + 1;
367 /*
368 * The clone is shallow if nr_parent < 0, and we must
369 * not traverse its real parents even when we unhide them.
370 */
371 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
372 continue;
373 new_parent = lookup_commit(&parent);
374 if (new_parent)
375 pptr = &commit_list_insert(new_parent, pptr)->next;
376 }
377 if (graft) {
378 int i;
379 struct commit *new_parent;
380 for (i = 0; i < graft->nr_parent; i++) {
381 new_parent = lookup_commit(&graft->parent[i]);
382 if (!new_parent)
383 continue;
384 pptr = &commit_list_insert(new_parent, pptr)->next;
385 }
386 }
387 item->date = parse_commit_date(bufptr, tail);
388 if (check_graph)
390 load_commit_graph_info(item);
391 return 0;
393}
394int parse_commit_gently(struct commit *item, int quiet_on_missing)
396{
397 enum object_type type;
398 void *buffer;
399 unsigned long size;
400 int ret;
401 if (!item)
403 return -1;
404 if (item->object.parsed)
405 return 0;
406 if (parse_commit_in_graph(item))
407 return 0;
408 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
409 if (!buffer)
410 return quiet_on_missing ? -1 :
411 error("Could not read %s",
412 oid_to_hex(&item->object.oid));
413 if (type != OBJ_COMMIT) {
414 free(buffer);
415 return error("Object %s not a commit",
416 oid_to_hex(&item->object.oid));
417 }
418 ret = parse_commit_buffer(item, buffer, size, 0);
419 if (save_commit_buffer && !ret) {
420 set_commit_buffer(item, buffer, size);
421 return 0;
422 }
423 free(buffer);
424 return ret;
425}
426void parse_commit_or_die(struct commit *item)
428{
429 if (parse_commit(item))
430 die("unable to parse commit %s",
431 item ? oid_to_hex(&item->object.oid) : "(null)");
432}
433int find_commit_subject(const char *commit_buffer, const char **subject)
435{
436 const char *eol;
437 const char *p = commit_buffer;
438 while (*p && (*p != '\n' || p[1] != '\n'))
440 p++;
441 if (*p) {
442 p = skip_blank_lines(p + 2);
443 eol = strchrnul(p, '\n');
444 } else
445 eol = p;
446 *subject = p;
448 return eol - p;
450}
451struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
453{
454 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
455 new_list->item = item;
456 new_list->next = *list_p;
457 *list_p = new_list;
458 return new_list;
459}
460unsigned commit_list_count(const struct commit_list *l)
462{
463 unsigned c = 0;
464 for (; l; l = l->next )
465 c++;
466 return c;
467}
468struct commit_list *copy_commit_list(struct commit_list *list)
470{
471 struct commit_list *head = NULL;
472 struct commit_list **pp = &head;
473 while (list) {
474 pp = commit_list_append(list->item, pp);
475 list = list->next;
476 }
477 return head;
478}
479void free_commit_list(struct commit_list *list)
481{
482 while (list)
483 pop_commit(&list);
484}
485struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
487{
488 struct commit_list **pp = list;
489 struct commit_list *p;
490 while ((p = *pp) != NULL) {
491 if (p->item->date < item->date) {
492 break;
493 }
494 pp = &p->next;
495 }
496 return commit_list_insert(item, pp);
497}
498static int commit_list_compare_by_date(const void *a, const void *b)
500{
501 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
502 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
503 if (a_date < b_date)
504 return 1;
505 if (a_date > b_date)
506 return -1;
507 return 0;
508}
509static void *commit_list_get_next(const void *a)
511{
512 return ((const struct commit_list *)a)->next;
513}
514static void commit_list_set_next(void *a, void *next)
516{
517 ((struct commit_list *)a)->next = next;
518}
519void commit_list_sort_by_date(struct commit_list **list)
521{
522 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
523 commit_list_compare_by_date);
524}
525struct commit *pop_most_recent_commit(struct commit_list **list,
527 unsigned int mark)
528{
529 struct commit *ret = pop_commit(list);
530 struct commit_list *parents = ret->parents;
531 while (parents) {
533 struct commit *commit = parents->item;
534 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
535 commit->object.flags |= mark;
536 commit_list_insert_by_date(commit, list);
537 }
538 parents = parents->next;
539 }
540 return ret;
541}
542static void clear_commit_marks_1(struct commit_list **plist,
544 struct commit *commit, unsigned int mark)
545{
546 while (commit) {
547 struct commit_list *parents;
548 if (!(mark & commit->object.flags))
550 return;
551 commit->object.flags &= ~mark;
553 parents = commit->parents;
555 if (!parents)
556 return;
557 while ((parents = parents->next))
559 commit_list_insert(parents->item, plist);
560 commit = commit->parents->item;
562 }
563}
564void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
566{
567 struct commit_list *list = NULL;
568 while (nr--) {
570 clear_commit_marks_1(&list, *commit, mark);
571 commit++;
572 }
573 while (list)
574 clear_commit_marks_1(&list, pop_commit(&list), mark);
575}
576void clear_commit_marks(struct commit *commit, unsigned int mark)
578{
579 clear_commit_marks_many(1, &commit, mark);
580}
581struct commit *pop_commit(struct commit_list **stack)
583{
584 struct commit_list *top = *stack;
585 struct commit *item = top ? top->item : NULL;
586 if (top) {
588 *stack = top->next;
589 free(top);
590 }
591 return item;
592}
593/*
595 * Topological sort support
596 */
597/* count number of children that have not been emitted */
599define_commit_slab(indegree_slab, int);
600/* record author-date for each commit object */
602define_commit_slab(author_date_slab, unsigned long);
603static void record_author_date(struct author_date_slab *author_date,
605 struct commit *commit)
606{
607 const char *buffer = get_commit_buffer(commit, NULL);
608 struct ident_split ident;
609 const char *ident_line;
610 size_t ident_len;
611 char *date_end;
612 timestamp_t date;
613 ident_line = find_commit_header(buffer, "author", &ident_len);
615 if (!ident_line)
616 goto fail_exit; /* no author line */
617 if (split_ident_line(&ident, ident_line, ident_len) ||
618 !ident.date_begin || !ident.date_end)
619 goto fail_exit; /* malformed "author" line */
620 date = parse_timestamp(ident.date_begin, &date_end, 10);
622 if (date_end != ident.date_end)
623 goto fail_exit; /* malformed date */
624 *(author_date_slab_at(author_date, commit)) = date;
625fail_exit:
627 unuse_commit_buffer(commit, buffer);
628}
629static int compare_commits_by_author_date(const void *a_, const void *b_,
631 void *cb_data)
632{
633 const struct commit *a = a_, *b = b_;
634 struct author_date_slab *author_date = cb_data;
635 timestamp_t a_date = *(author_date_slab_at(author_date, a));
636 timestamp_t b_date = *(author_date_slab_at(author_date, b));
637 /* newer commits with larger date first */
639 if (a_date < b_date)
640 return 1;
641 else if (a_date > b_date)
642 return -1;
643 return 0;
644}
645int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
647{
648 const struct commit *a = a_, *b = b_;
649 /* newer commits first */
651 if (a->generation < b->generation)
652 return 1;
653 else if (a->generation > b->generation)
654 return -1;
655 /* use date as a heuristic when generations are equal */
657 if (a->date < b->date)
658 return 1;
659 else if (a->date > b->date)
660 return -1;
661 return 0;
662}
663int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
665{
666 const struct commit *a = a_, *b = b_;
667 /* newer commits with larger date first */
668 if (a->date < b->date)
669 return 1;
670 else if (a->date > b->date)
671 return -1;
672 return 0;
673}
674/*
676 * Performs an in-place topological sort on the list supplied.
677 */
678void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
679{
680 struct commit_list *next, *orig = *list;
681 struct commit_list **pptr;
682 struct indegree_slab indegree;
683 struct prio_queue queue;
684 struct commit *commit;
685 struct author_date_slab author_date;
686 if (!orig)
688 return;
689 *list = NULL;
690 init_indegree_slab(&indegree);
692 memset(&queue, '\0', sizeof(queue));
693 switch (sort_order) {
695 default: /* REV_SORT_IN_GRAPH_ORDER */
696 queue.compare = NULL;
697 break;
698 case REV_SORT_BY_COMMIT_DATE:
699 queue.compare = compare_commits_by_commit_date;
700 break;
701 case REV_SORT_BY_AUTHOR_DATE:
702 init_author_date_slab(&author_date);
703 queue.compare = compare_commits_by_author_date;
704 queue.cb_data = &author_date;
705 break;
706 }
707 /* Mark them and clear the indegree */
709 for (next = orig; next; next = next->next) {
710 struct commit *commit = next->item;
711 *(indegree_slab_at(&indegree, commit)) = 1;
712 /* also record the author dates, if needed */
713 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
714 record_author_date(&author_date, commit);
715 }
716 /* update the indegree */
718 for (next = orig; next; next = next->next) {
719 struct commit_list *parents = next->item->parents;
720 while (parents) {
721 struct commit *parent = parents->item;
722 int *pi = indegree_slab_at(&indegree, parent);
723 if (*pi)
725 (*pi)++;
726 parents = parents->next;
727 }
728 }
729 /*
731 * find the tips
732 *
733 * tips are nodes not reachable from any other node in the list
734 *
735 * the tips serve as a starting set for the work queue.
736 */
737 for (next = orig; next; next = next->next) {
738 struct commit *commit = next->item;
739 if (*(indegree_slab_at(&indegree, commit)) == 1)
741 prio_queue_put(&queue, commit);
742 }
743 /*
745 * This is unfortunate; the initial tips need to be shown
746 * in the order given from the revision traversal machinery.
747 */
748 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
749 prio_queue_reverse(&queue);
750 /* We no longer need the commit list */
752 free_commit_list(orig);
753 pptr = list;
755 *list = NULL;
756 while ((commit = prio_queue_get(&queue)) != NULL) {
757 struct commit_list *parents;
758 for (parents = commit->parents; parents ; parents = parents->next) {
760 struct commit *parent = parents->item;
761 int *pi = indegree_slab_at(&indegree, parent);
762 if (!*pi)
764 continue;
765 /*
767 * parents are only enqueued for emission
768 * when all their children have been emitted thereby
769 * guaranteeing topological order.
770 */
771 if (--(*pi) == 1)
772 prio_queue_put(&queue, parent);
773 }
774 /*
775 * all children of commit have already been
776 * emitted. we can emit it now.
777 */
778 *(indegree_slab_at(&indegree, commit)) = 0;
779 pptr = &commit_list_insert(commit, pptr)->next;
781 }
782 clear_indegree_slab(&indegree);
784 clear_prio_queue(&queue);
785 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
786 clear_author_date_slab(&author_date);
787}
788/* merge-base stuff */
790/* Remember to update object flag allocation in object.h */
792#define PARENT1 (1u<<16)
793#define PARENT2 (1u<<17)
794#define STALE (1u<<18)
795#define RESULT (1u<<19)
796static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
798static int queue_has_nonstale(struct prio_queue *queue)
800{
801 int i;
802 for (i = 0; i < queue->nr; i++) {
803 struct commit *commit = queue->array[i].data;
804 if (!(commit->object.flags & STALE))
805 return 1;
806 }
807 return 0;
808}
809/* all input commits in one and twos[] must have been parsed! */
811static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
812{
813 struct prio_queue queue = { compare_commits_by_gen_then_commit_date };
814 struct commit_list *result = NULL;
815 int i;
816 one->object.flags |= PARENT1;
818 if (!n) {
819 commit_list_append(one, &result);
820 return result;
821 }
822 prio_queue_put(&queue, one);
823 for (i = 0; i < n; i++) {
825 twos[i]->object.flags |= PARENT2;
826 prio_queue_put(&queue, twos[i]);
827 }
828 while (queue_has_nonstale(&queue)) {
830 struct commit *commit = prio_queue_get(&queue);
831 struct commit_list *parents;
832 int flags;
833 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
835 if (flags == (PARENT1 | PARENT2)) {
836 if (!(commit->object.flags & RESULT)) {
837 commit->object.flags |= RESULT;
838 commit_list_insert_by_date(commit, &result);
839 }
840 /* Mark parents of a found merge stale */
841 flags |= STALE;
842 }
843 parents = commit->parents;
844 while (parents) {
845 struct commit *p = parents->item;
846 parents = parents->next;
847 if ((p->object.flags & flags) == flags)
848 continue;
849 if (parse_commit(p))
850 return NULL;
851 p->object.flags |= flags;
852 prio_queue_put(&queue, p);
853 }
854 }
855 clear_prio_queue(&queue);
857 return result;
858}
859static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
861{
862 struct commit_list *list = NULL;
863 struct commit_list *result = NULL;
864 int i;
865 for (i = 0; i < n; i++) {
867 if (one == twos[i])
868 /*
869 * We do not mark this even with RESULT so we do not
870 * have to clean it up.
871 */
872 return commit_list_insert(one, &result);
873 }
874 if (parse_commit(one))
876 return NULL;
877 for (i = 0; i < n; i++) {
878 if (parse_commit(twos[i]))
879 return NULL;
880 }
881 list = paint_down_to_common(one, n, twos);
883 while (list) {
885 struct commit *commit = pop_commit(&list);
886 if (!(commit->object.flags & STALE))
887 commit_list_insert_by_date(commit, &result);
888 }
889 return result;
890}
891struct commit_list *get_octopus_merge_bases(struct commit_list *in)
893{
894 struct commit_list *i, *j, *k, *ret = NULL;
895 if (!in)
897 return ret;
898 commit_list_insert(in->item, &ret);
900 for (i = in->next; i; i = i->next) {
902 struct commit_list *new_commits = NULL, *end = NULL;
903 for (j = ret; j; j = j->next) {
905 struct commit_list *bases;
906 bases = get_merge_bases(i->item, j->item);
907 if (!new_commits)
908 new_commits = bases;
909 else
910 end->next = bases;
911 for (k = bases; k; k = k->next)
912 end = k;
913 }
914 ret = new_commits;
915 }
916 return ret;
917}
918static int remove_redundant(struct commit **array, int cnt)
920{
921 /*
922 * Some commit in the array may be an ancestor of
923 * another commit. Move such commit to the end of
924 * the array, and return the number of commits that
925 * are independent from each other.
926 */
927 struct commit **work;
928 unsigned char *redundant;
929 int *filled_index;
930 int i, j, filled;
931 work = xcalloc(cnt, sizeof(*work));
933 redundant = xcalloc(cnt, 1);
934 ALLOC_ARRAY(filled_index, cnt - 1);
935 for (i = 0; i < cnt; i++)
937 parse_commit(array[i]);
938 for (i = 0; i < cnt; i++) {
939 struct commit_list *common;
940 if (redundant[i])
942 continue;
943 for (j = filled = 0; j < cnt; j++) {
944 if (i == j || redundant[j])
945 continue;
946 filled_index[filled] = j;
947 work[filled++] = array[j];
948 }
949 common = paint_down_to_common(array[i], filled, work);
950 if (array[i]->object.flags & PARENT2)
951 redundant[i] = 1;
952 for (j = 0; j < filled; j++)
953 if (work[j]->object.flags & PARENT1)
954 redundant[filled_index[j]] = 1;
955 clear_commit_marks(array[i], all_flags);
956 clear_commit_marks_many(filled, work, all_flags);
957 free_commit_list(common);
958 }
959 /* Now collect the result */
961 COPY_ARRAY(work, array, cnt);
962 for (i = filled = 0; i < cnt; i++)
963 if (!redundant[i])
964 array[filled++] = work[i];
965 for (j = filled, i = 0; i < cnt; i++)
966 if (redundant[i])
967 array[j++] = work[i];
968 free(work);
969 free(redundant);
970 free(filled_index);
971 return filled;
972}
973static struct commit_list *get_merge_bases_many_0(struct commit *one,
975 int n,
976 struct commit **twos,
977 int cleanup)
978{
979 struct commit_list *list;
980 struct commit **rslt;
981 struct commit_list *result;
982 int cnt, i;
983 result = merge_bases_many(one, n, twos);
985 for (i = 0; i < n; i++) {
986 if (one == twos[i])
987 return result;
988 }
989 if (!result || !result->next) {
990 if (cleanup) {
991 clear_commit_marks(one, all_flags);
992 clear_commit_marks_many(n, twos, all_flags);
993 }
994 return result;
995 }
996 /* There are more than one */
998 cnt = commit_list_count(result);
999 rslt = xcalloc(cnt, sizeof(*rslt));
1000 for (list = result, i = 0; list; list = list->next)
1001 rslt[i++] = list->item;
1002 free_commit_list(result);
1003 clear_commit_marks(one, all_flags);
1005 clear_commit_marks_many(n, twos, all_flags);
1006 cnt = remove_redundant(rslt, cnt);
1008 result = NULL;
1009 for (i = 0; i < cnt; i++)
1010 commit_list_insert_by_date(rslt[i], &result);
1011 free(rslt);
1012 return result;
1013}
1014struct commit_list *get_merge_bases_many(struct commit *one,
1016 int n,
1017 struct commit **twos)
1018{
1019 return get_merge_bases_many_0(one, n, twos, 1);
1020}
1021struct commit_list *get_merge_bases_many_dirty(struct commit *one,
1023 int n,
1024 struct commit **twos)
1025{
1026 return get_merge_bases_many_0(one, n, twos, 0);
1027}
1028struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1030{
1031 return get_merge_bases_many_0(one, 1, &two, 1);
1032}
1033/*
1035 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1036 */
1037int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1038{
1039 if (!with_commit)
1040 return 1;
1041 while (with_commit) {
1042 struct commit *other;
1043 other = with_commit->item;
1045 with_commit = with_commit->next;
1046 if (in_merge_bases(other, commit))
1047 return 1;
1048 }
1049 return 0;
1050}
1051/*
1053 * Is "commit" an ancestor of one of the "references"?
1054 */
1055int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1056{
1057 struct commit_list *bases;
1058 int ret = 0, i;
1059 if (parse_commit(commit))
1061 return ret;
1062 for (i = 0; i < nr_reference; i++)
1063 if (parse_commit(reference[i]))
1064 return ret;
1065 bases = paint_down_to_common(commit, nr_reference, reference);
1067 if (commit->object.flags & PARENT2)
1068 ret = 1;
1069 clear_commit_marks(commit, all_flags);
1070 clear_commit_marks_many(nr_reference, reference, all_flags);
1071 free_commit_list(bases);
1072 return ret;
1073}
1074/*
1076 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1077 */
1078int in_merge_bases(struct commit *commit, struct commit *reference)
1079{
1080 return in_merge_bases_many(commit, 1, &reference);
1081}
1082struct commit_list *reduce_heads(struct commit_list *heads)
1084{
1085 struct commit_list *p;
1086 struct commit_list *result = NULL, **tail = &result;
1087 struct commit **array;
1088 int num_head, i;
1089 if (!heads)
1091 return NULL;
1092 /* Uniquify */
1094 for (p = heads; p; p = p->next)
1095 p->item->object.flags &= ~STALE;
1096 for (p = heads, num_head = 0; p; p = p->next) {
1097 if (p->item->object.flags & STALE)
1098 continue;
1099 p->item->object.flags |= STALE;
1100 num_head++;
1101 }
1102 array = xcalloc(num_head, sizeof(*array));
1103 for (p = heads, i = 0; p; p = p->next) {
1104 if (p->item->object.flags & STALE) {
1105 array[i++] = p->item;
1106 p->item->object.flags &= ~STALE;
1107 }
1108 }
1109 num_head = remove_redundant(array, num_head);
1110 for (i = 0; i < num_head; i++)
1111 tail = &commit_list_insert(array[i], tail)->next;
1112 free(array);
1113 return result;
1114}
1115void reduce_heads_replace(struct commit_list **heads)
1117{
1118 struct commit_list *result = reduce_heads(*heads);
1119 free_commit_list(*heads);
1120 *heads = result;
1121}
1122static const char gpg_sig_header[] = "gpgsig";
1124static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1125static int do_sign_commit(struct strbuf *buf, const char *keyid)
1127{
1128 struct strbuf sig = STRBUF_INIT;
1129 int inspos, copypos;
1130 const char *eoh;
1131 /* find the end of the header */
1133 eoh = strstr(buf->buf, "\n\n");
1134 if (!eoh)
1135 inspos = buf->len;
1136 else
1137 inspos = eoh - buf->buf + 1;
1138 if (!keyid || !*keyid)
1140 keyid = get_signing_key();
1141 if (sign_buffer(buf, &sig, keyid)) {
1142 strbuf_release(&sig);
1143 return -1;
1144 }
1145 for (copypos = 0; sig.buf[copypos]; ) {
1147 const char *bol = sig.buf + copypos;
1148 const char *eol = strchrnul(bol, '\n');
1149 int len = (eol - bol) + !!*eol;
1150 if (!copypos) {
1152 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1153 inspos += gpg_sig_header_len;
1154 }
1155 strbuf_insert(buf, inspos++, " ", 1);
1156 strbuf_insert(buf, inspos, bol, len);
1157 inspos += len;
1158 copypos += len;
1159 }
1160 strbuf_release(&sig);
1161 return 0;
1162}
1163int parse_signed_commit(const struct commit *commit,
1165 struct strbuf *payload, struct strbuf *signature)
1166{
1167 unsigned long size;
1169 const char *buffer = get_commit_buffer(commit, &size);
1170 int in_signature, saw_signature = -1;
1171 const char *line, *tail;
1172 line = buffer;
1174 tail = buffer + size;
1175 in_signature = 0;
1176 saw_signature = 0;
1177 while (line < tail) {
1178 const char *sig = NULL;
1179 const char *next = memchr(line, '\n', tail - line);
1180 next = next ? next + 1 : tail;
1182 if (in_signature && line[0] == ' ')
1183 sig = line + 1;
1184 else if (starts_with(line, gpg_sig_header) &&
1185 line[gpg_sig_header_len] == ' ')
1186 sig = line + gpg_sig_header_len + 1;
1187 if (sig) {
1188 strbuf_add(signature, sig, next - sig);
1189 saw_signature = 1;
1190 in_signature = 1;
1191 } else {
1192 if (*line == '\n')
1193 /* dump the whole remainder of the buffer */
1194 next = tail;
1195 strbuf_add(payload, line, next - line);
1196 in_signature = 0;
1197 }
1198 line = next;
1199 }
1200 unuse_commit_buffer(commit, buffer);
1201 return saw_signature;
1202}
1203int remove_signature(struct strbuf *buf)
1205{
1206 const char *line = buf->buf;
1207 const char *tail = buf->buf + buf->len;
1208 int in_signature = 0;
1209 const char *sig_start = NULL;
1210 const char *sig_end = NULL;
1211 while (line < tail) {
1213 const char *next = memchr(line, '\n', tail - line);
1214 next = next ? next + 1 : tail;
1215 if (in_signature && line[0] == ' ')
1217 sig_end = next;
1218 else if (starts_with(line, gpg_sig_header) &&
1219 line[gpg_sig_header_len] == ' ') {
1220 sig_start = line;
1221 sig_end = next;
1222 in_signature = 1;
1223 } else {
1224 if (*line == '\n')
1225 /* dump the whole remainder of the buffer */
1226 next = tail;
1227 in_signature = 0;
1228 }
1229 line = next;
1230 }
1231 if (sig_start)
1233 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1234 return sig_start != NULL;
1236}
1237static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1239{
1240 struct merge_remote_desc *desc;
1241 struct commit_extra_header *mergetag;
1242 char *buf;
1243 unsigned long size, len;
1244 enum object_type type;
1245 desc = merge_remote_util(parent);
1247 if (!desc || !desc->obj)
1248 return;
1249 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
1250 if (!buf || type != OBJ_TAG)
1251 goto free_return;
1252 len = parse_signature(buf, size);
1253 if (size == len)
1254 goto free_return;
1255 /*
1256 * We could verify this signature and either omit the tag when
1257 * it does not validate, but the integrator may not have the
1258 * public key of the signer of the tag he is merging, while a
1259 * later auditor may have it while auditing, so let's not run
1260 * verify-signed-buffer here for now...
1261 *
1262 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1263 * warn("warning: signed tag unverified.");
1264 */
1265 mergetag = xcalloc(1, sizeof(*mergetag));
1266 mergetag->key = xstrdup("mergetag");
1267 mergetag->value = buf;
1268 mergetag->len = size;
1269 **tail = mergetag;
1271 *tail = &mergetag->next;
1272 return;
1273free_return:
1275 free(buf);
1276}
1277int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1279{
1280 struct strbuf payload = STRBUF_INIT;
1281 struct strbuf signature = STRBUF_INIT;
1282 int ret = 1;
1283 sigc->result = 'N';
1285 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1287 goto out;
1288 ret = check_signature(payload.buf, payload.len, signature.buf,
1289 signature.len, sigc);
1290 out:
1292 strbuf_release(&payload);
1293 strbuf_release(&signature);
1294 return ret;
1296}
1297void append_merge_tag_headers(struct commit_list *parents,
1301 struct commit_extra_header ***tail)
1302{
1303 while (parents) {
1304 struct commit *parent = parents->item;
1305 handle_signed_tag(parent, tail);
1306 parents = parents->next;
1307 }
1308}
1309static void add_extra_header(struct strbuf *buffer,
1311 struct commit_extra_header *extra)
1312{
1313 strbuf_addstr(buffer, extra->key);
1314 if (extra->len)
1315 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1316 else
1317 strbuf_addch(buffer, '\n');
1318}
1319struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1321 const char **exclude)
1322{
1323 struct commit_extra_header *extra = NULL;
1324 unsigned long size;
1325 const char *buffer = get_commit_buffer(commit, &size);
1326 extra = read_commit_extra_header_lines(buffer, size, exclude);
1327 unuse_commit_buffer(commit, buffer);
1328 return extra;
1329}
1330void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1332{
1333 struct commit_extra_header *extra, *to_free;
1334 to_free = read_commit_extra_headers(commit, NULL);
1336 for (extra = to_free; extra; extra = extra->next) {
1337 if (strcmp(extra->key, "mergetag"))
1338 continue; /* not a merge tag */
1339 fn(commit, extra, data);
1340 }
1341 free_commit_extra_headers(to_free);
1342}
1343static inline int standard_header_field(const char *field, size_t len)
1345{
1346 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1347 (len == 6 && !memcmp(field, "parent", 6)) ||
1348 (len == 6 && !memcmp(field, "author", 6)) ||
1349 (len == 9 && !memcmp(field, "committer", 9)) ||
1350 (len == 8 && !memcmp(field, "encoding", 8)));
1351}
1352static int excluded_header_field(const char *field, size_t len, const char **exclude)
1354{
1355 if (!exclude)
1356 return 0;
1357 while (*exclude) {
1359 size_t xlen = strlen(*exclude);
1360 if (len == xlen && !memcmp(field, *exclude, xlen))
1361 return 1;
1362 exclude++;
1363 }
1364 return 0;
1365}
1366static struct commit_extra_header *read_commit_extra_header_lines(
1368 const char *buffer, size_t size,
1369 const char **exclude)
1370{
1371 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1372 const char *line, *next, *eof, *eob;
1373 struct strbuf buf = STRBUF_INIT;
1374 for (line = buffer, eob = line + size;
1376 line < eob && *line != '\n';
1377 line = next) {
1378 next = memchr(line, '\n', eob - line);
1379 next = next ? next + 1 : eob;
1380 if (*line == ' ') {
1381 /* continuation */
1382 if (it)
1383 strbuf_add(&buf, line + 1, next - (line + 1));
1384 continue;
1385 }
1386 if (it)
1387 it->value = strbuf_detach(&buf, &it->len);
1388 strbuf_reset(&buf);
1389 it = NULL;
1390 eof = memchr(line, ' ', next - line);
1392 if (!eof)
1393 eof = next;
1394 else if (standard_header_field(line, eof - line) ||
1395 excluded_header_field(line, eof - line, exclude))
1396 continue;
1397 it = xcalloc(1, sizeof(*it));
1399 it->key = xmemdupz(line, eof-line);
1400 *tail = it;
1401 tail = &it->next;
1402 if (eof + 1 < next)
1403 strbuf_add(&buf, eof + 1, next - (eof + 1));
1404 }
1405 if (it)
1406 it->value = strbuf_detach(&buf, &it->len);
1407 return extra;
1408}
1409void free_commit_extra_headers(struct commit_extra_header *extra)
1411{
1412 while (extra) {
1413 struct commit_extra_header *next = extra->next;
1414 free(extra->key);
1415 free(extra->value);
1416 free(extra);
1417 extra = next;
1418 }
1419}
1420int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1422 struct commit_list *parents, struct object_id *ret,
1423 const char *author, const char *sign_commit)
1424{
1425 struct commit_extra_header *extra = NULL, **tail = &extra;
1426 int result;
1427 append_merge_tag_headers(parents, &tail);
1429 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1430 author, sign_commit, extra);
1431 free_commit_extra_headers(extra);
1432 return result;
1433}
1434static int find_invalid_utf8(const char *buf, int len)
1436{
1437 int offset = 0;
1438 static const unsigned int max_codepoint[] = {
1439 0x7f, 0x7ff, 0xffff, 0x10ffff
1440 };
1441 while (len) {
1443 unsigned char c = *buf++;
1444 int bytes, bad_offset;
1445 unsigned int codepoint;
1446 unsigned int min_val, max_val;
1447 len--;
1449 offset++;
1450 /* Simple US-ASCII? No worries. */
1452 if (c < 0x80)
1453 continue;
1454 bad_offset = offset-1;
1456 /*
1458 * Count how many more high bits set: that's how
1459 * many more bytes this sequence should have.
1460 */
1461 bytes = 0;
1462 while (c & 0x40) {
1463 c <<= 1;
1464 bytes++;
1465 }
1466 /*
1468 * Must be between 1 and 3 more bytes. Longer sequences result in
1469 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1470 */
1471 if (bytes < 1 || 3 < bytes)
1472 return bad_offset;
1473 /* Do we *have* that many bytes? */
1475 if (len < bytes)
1476 return bad_offset;
1477 /*
1479 * Place the encoded bits at the bottom of the value and compute the
1480 * valid range.
1481 */
1482 codepoint = (c & 0x7f) >> bytes;
1483 min_val = max_codepoint[bytes-1] + 1;
1484 max_val = max_codepoint[bytes];
1485 offset += bytes;
1487 len -= bytes;
1488 /* And verify that they are good continuation bytes */
1490 do {
1491 codepoint <<= 6;
1492 codepoint |= *buf & 0x3f;
1493 if ((*buf++ & 0xc0) != 0x80)
1494 return bad_offset;
1495 } while (--bytes);
1496 /* Reject codepoints that are out of range for the sequence length. */
1498 if (codepoint < min_val || codepoint > max_val)
1499 return bad_offset;
1500 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1501 if ((codepoint & 0x1ff800) == 0xd800)
1502 return bad_offset;
1503 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1504 if ((codepoint & 0xfffe) == 0xfffe)
1505 return bad_offset;
1506 /* So are anything in the range U+FDD0..U+FDEF. */
1507 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1508 return bad_offset;
1509 }
1510 return -1;
1511}
1512/*
1514 * This verifies that the buffer is in proper utf8 format.
1515 *
1516 * If it isn't, it assumes any non-utf8 characters are Latin1,
1517 * and does the conversion.
1518 */
1519static int verify_utf8(struct strbuf *buf)
1520{
1521 int ok = 1;
1522 long pos = 0;
1523 for (;;) {
1525 int bad;
1526 unsigned char c;
1527 unsigned char replace[2];
1528 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1530 if (bad < 0)
1531 return ok;
1532 pos += bad;
1533 ok = 0;
1534 c = buf->buf[pos];
1535 strbuf_remove(buf, pos, 1);
1536 /* We know 'c' must be in the range 128-255 */
1538 replace[0] = 0xc0 + (c >> 6);
1539 replace[1] = 0x80 + (c & 0x3f);
1540 strbuf_insert(buf, pos, replace, 2);
1541 pos += 2;
1542 }
1543}
1544static const char commit_utf8_warn[] =
1546N_("Warning: commit message did not conform to UTF-8.\n"
1547 "You may want to amend it after fixing the message, or set the config\n"
1548 "variable i18n.commitencoding to the encoding your project uses.\n");
1549int commit_tree_extended(const char *msg, size_t msg_len,
1551 const struct object_id *tree,
1552 struct commit_list *parents, struct object_id *ret,
1553 const char *author, const char *sign_commit,
1554 struct commit_extra_header *extra)
1555{
1556 int result;
1557 int encoding_is_utf8;
1558 struct strbuf buffer;
1559 assert_sha1_type(tree->hash, OBJ_TREE);
1561 if (memchr(msg, '\0', msg_len))
1563 return error("a NUL byte in commit log message not allowed.");
1564 /* Not having i18n.commitencoding is the same as having utf-8 */
1566 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1567 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1569 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
1570 /*
1572 * NOTE! This ordering means that the same exact tree merged with a
1573 * different order of parents will be a _different_ changeset even
1574 * if everything else stays the same.
1575 */
1576 while (parents) {
1577 struct commit *parent = pop_commit(&parents);
1578 strbuf_addf(&buffer, "parent %s\n",
1579 oid_to_hex(&parent->object.oid));
1580 }
1581 /* Person/date information */
1583 if (!author)
1584 author = git_author_info(IDENT_STRICT);
1585 strbuf_addf(&buffer, "author %s\n", author);
1586 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1587 if (!encoding_is_utf8)
1588 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1589 while (extra) {
1591 add_extra_header(&buffer, extra);
1592 extra = extra->next;
1593 }
1594 strbuf_addch(&buffer, '\n');
1595 /* And add the comment */
1597 strbuf_add(&buffer, msg, msg_len);
1598 /* And check the encoding */
1600 if (encoding_is_utf8 && !verify_utf8(&buffer))
1601 fprintf(stderr, _(commit_utf8_warn));
1602 if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
1604 result = -1;
1605 goto out;
1606 }
1607 result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
1609out:
1610 strbuf_release(&buffer);
1611 return result;
1612}
1613void set_merge_remote_desc(struct commit *commit,
1615 const char *name, struct object *obj)
1616{
1617 struct merge_remote_desc *desc;
1618 FLEX_ALLOC_STR(desc, name, name);
1619 desc->obj = obj;
1620 commit->util = desc;
1621}
1622struct commit *get_merge_parent(const char *name)
1624{
1625 struct object *obj;
1626 struct commit *commit;
1627 struct object_id oid;
1628 if (get_oid(name, &oid))
1629 return NULL;
1630 obj = parse_object(&oid);
1631 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1632 if (commit && !commit->util)
1633 set_merge_remote_desc(commit, name, obj);
1634 return commit;
1635}
1636/*
1638 * Append a commit to the end of the commit_list.
1639 *
1640 * next starts by pointing to the variable that holds the head of an
1641 * empty commit_list, and is updated to point to the "next" field of
1642 * the last item on the list as new commits are appended.
1643 *
1644 * Usage example:
1645 *
1646 * struct commit_list *list;
1647 * struct commit_list **next = &list;
1648 *
1649 * next = commit_list_append(c1, next);
1650 * next = commit_list_append(c2, next);
1651 * assert(commit_list_count(list) == 2);
1652 * return list;
1653 */
1654struct commit_list **commit_list_append(struct commit *commit,
1655 struct commit_list **next)
1656{
1657 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1658 new_commit->item = commit;
1659 *next = new_commit;
1660 new_commit->next = NULL;
1661 return &new_commit->next;
1662}
1663const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1665{
1666 int key_len = strlen(key);
1667 const char *line = msg;
1668 while (line) {
1670 const char *eol = strchrnul(line, '\n');
1671 if (line == eol)
1673 return NULL;
1674 if (eol - line > key_len &&
1676 !strncmp(line, key, key_len) &&
1677 line[key_len] == ' ') {
1678 *out_len = eol - line - key_len - 1;
1679 return line + key_len + 1;
1680 }
1681 line = *eol ? eol + 1 : NULL;
1682 }
1683 return NULL;
1684}
1685/*
1687 * Inspect the given string and determine the true "end" of the log message, in
1688 * order to find where to put a new Signed-off-by: line. Ignored are
1689 * trailing comment lines and blank lines. To support "git commit -s
1690 * --amend" on an existing commit, we also ignore "Conflicts:". To
1691 * support "git commit -v", we truncate at cut lines.
1692 *
1693 * Returns the number of bytes from the tail to ignore, to be fed as
1694 * the second parameter to append_signoff().
1695 */
1696int ignore_non_trailer(const char *buf, size_t len)
1697{
1698 int boc = 0;
1699 int bol = 0;
1700 int in_old_conflicts_block = 0;
1701 size_t cutoff = wt_status_locate_end(buf, len);
1702 while (bol < cutoff) {
1704 const char *next_line = memchr(buf + bol, '\n', len - bol);
1705 if (!next_line)
1707 next_line = buf + len;
1708 else
1709 next_line++;
1710 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1712 /* is this the first of the run of comments? */
1713 if (!boc)
1714 boc = bol;
1715 /* otherwise, it is just continuing */
1716 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1717 in_old_conflicts_block = 1;
1718 if (!boc)
1719 boc = bol;
1720 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1721 ; /* a pathname in the conflicts block */
1722 } else if (boc) {
1723 /* the previous was not trailing comment */
1724 boc = 0;
1725 in_old_conflicts_block = 0;
1726 }
1727 bol = next_line - buf;
1728 }
1729 return boc ? len - boc : len - cutoff;
1730}