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