merge/pull: verify GPG signatures of commits being merged
[git/git.git] / commit.c
CommitLineData
8f1d2e6f 1#include "cache.h"
961784ee 2#include "tag.h"
175785e5 3#include "commit.h"
ed09aef0 4#include "pkt-line.h"
52883fbd 5#include "utf8.h"
199c45bf
JH
6#include "diff.h"
7#include "revision.h"
a97a7468 8#include "notes.h"
ba3c69a9 9#include "gpg-interface.h"
46905893 10#include "mergesort.h"
175785e5 11
82a75299
JH
12static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
13
60ab26de
LT
14int save_commit_buffer = 1;
15
175785e5
DB
16const char *commit_type = "commit";
17
f76412ed
JH
18static struct commit *check_commit(struct object *obj,
19 const unsigned char *sha1,
20 int quiet)
961784ee 21{
1974632c 22 if (obj->type != OBJ_COMMIT) {
f76412ed
JH
23 if (!quiet)
24 error("Object %s is a %s, not a commit",
885a86ab 25 sha1_to_hex(sha1), typename(obj->type));
961784ee
LT
26 return NULL;
27 }
28 return (struct commit *) obj;
29}
30
f76412ed
JH
31struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
32 int quiet)
961784ee 33{
9534f40b 34 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
35
36 if (!obj)
37 return NULL;
f76412ed
JH
38 return check_commit(obj, sha1, quiet);
39}
40
41struct commit *lookup_commit_reference(const unsigned char *sha1)
42{
43 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
44}
45
baf18fc2
NTND
46struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
47{
48 struct commit *c = lookup_commit_reference(sha1);
49 if (!c)
50 die(_("could not parse %s"), ref_name);
51 if (hashcmp(sha1, c->object.sha1)) {
52 warning(_("%s %s is not a commit!"),
53 ref_name, sha1_to_hex(sha1));
54 }
55 return c;
56}
57
5d6ccf5c 58struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
59{
60 struct object *obj = lookup_object(sha1);
100c5f3b
LT
61 if (!obj)
62 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
d1af002d 63 if (!obj->type)
1974632c 64 obj->type = OBJ_COMMIT;
f76412ed 65 return check_commit(obj, sha1, 0);
175785e5
DB
66}
67
a6fa5992
PN
68struct commit *lookup_commit_reference_by_name(const char *name)
69{
70 unsigned char sha1[20];
71 struct commit *commit;
72
cd74e473 73 if (get_sha1_committish(name, sha1))
a6fa5992
PN
74 return NULL;
75 commit = lookup_commit_reference(sha1);
76 if (!commit || parse_commit(commit))
77 return NULL;
78 return commit;
79}
80
0a617799 81static unsigned long parse_commit_date(const char *buf, const char *tail)
175785e5 82{
0a617799 83 const char *dateptr;
175785e5 84
0a617799
MK
85 if (buf + 6 >= tail)
86 return 0;
175785e5
DB
87 if (memcmp(buf, "author", 6))
88 return 0;
0a617799 89 while (buf < tail && *buf++ != '\n')
175785e5 90 /* nada */;
0a617799
MK
91 if (buf + 9 >= tail)
92 return 0;
175785e5
DB
93 if (memcmp(buf, "committer", 9))
94 return 0;
0a617799 95 while (buf < tail && *buf++ != '>')
175785e5 96 /* nada */;
0a617799
MK
97 if (buf >= tail)
98 return 0;
99 dateptr = buf;
100 while (buf < tail && *buf++ != '\n')
101 /* nada */;
102 if (buf >= tail)
103 return 0;
104 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
f2909743 105 return strtoul(dateptr, NULL, 10);
175785e5
DB
106}
107
5040f17e 108static struct commit_graft **commit_graft;
5da5c8f4
JH
109static int commit_graft_alloc, commit_graft_nr;
110
111static int commit_graft_pos(const unsigned char *sha1)
112{
113 int lo, hi;
114 lo = 0;
115 hi = commit_graft_nr;
116 while (lo < hi) {
117 int mi = (lo + hi) / 2;
118 struct commit_graft *graft = commit_graft[mi];
a89fccd2 119 int cmp = hashcmp(sha1, graft->sha1);
5da5c8f4
JH
120 if (!cmp)
121 return mi;
122 if (cmp < 0)
123 hi = mi;
124 else
125 lo = mi + 1;
126 }
127 return -lo - 1;
128}
129
5040f17e
JH
130int register_commit_graft(struct commit_graft *graft, int ignore_dups)
131{
132 int pos = commit_graft_pos(graft->sha1);
a6080a0a 133
5040f17e
JH
134 if (0 <= pos) {
135 if (ignore_dups)
136 free(graft);
137 else {
138 free(commit_graft[pos]);
139 commit_graft[pos] = graft;
140 }
141 return 1;
142 }
143 pos = -pos - 1;
144 if (commit_graft_alloc <= ++commit_graft_nr) {
145 commit_graft_alloc = alloc_nr(commit_graft_alloc);
146 commit_graft = xrealloc(commit_graft,
147 sizeof(*commit_graft) *
148 commit_graft_alloc);
149 }
150 if (pos < commit_graft_nr)
151 memmove(commit_graft + pos + 1,
152 commit_graft + pos,
153 (commit_graft_nr - pos - 1) *
154 sizeof(*commit_graft));
155 commit_graft[pos] = graft;
156 return 0;
157}
158
159struct commit_graft *read_graft_line(char *buf, int len)
160{
161 /* The format is just "Commit Parent1 Parent2 ...\n" */
162 int i;
163 struct commit_graft *graft = NULL;
164
fe0a3cb2
JH
165 while (len && isspace(buf[len-1]))
166 buf[--len] = '\0';
360204c3 167 if (buf[0] == '#' || buf[0] == '\0')
5bc4ce58 168 return NULL;
df5d43be
RT
169 if ((len + 1) % 41)
170 goto bad_graft_data;
5040f17e
JH
171 i = (len + 1) / 41 - 1;
172 graft = xmalloc(sizeof(*graft) + 20 * i);
173 graft->nr_parent = i;
174 if (get_sha1_hex(buf, graft->sha1))
175 goto bad_graft_data;
176 for (i = 40; i < len; i += 41) {
177 if (buf[i] != ' ')
178 goto bad_graft_data;
179 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
180 goto bad_graft_data;
181 }
182 return graft;
df5d43be
RT
183
184bad_graft_data:
185 error("bad graft data: %s", buf);
186 free(graft);
187 return NULL;
5040f17e
JH
188}
189
c5ae6439 190static int read_graft_file(const char *graft_file)
5da5c8f4 191{
5da5c8f4
JH
192 FILE *fp = fopen(graft_file, "r");
193 char buf[1024];
5040f17e
JH
194 if (!fp)
195 return -1;
5da5c8f4
JH
196 while (fgets(buf, sizeof(buf), fp)) {
197 /* The format is just "Commit Parent1 Parent2 ...\n" */
198 int len = strlen(buf);
5040f17e 199 struct commit_graft *graft = read_graft_line(buf, len);
5bc4ce58
JH
200 if (!graft)
201 continue;
5040f17e 202 if (register_commit_graft(graft, 1))
5da5c8f4 203 error("duplicate graft data: %s", buf);
5da5c8f4
JH
204 }
205 fclose(fp);
5040f17e
JH
206 return 0;
207}
208
209static void prepare_commit_graft(void)
210{
211 static int commit_graft_prepared;
212 char *graft_file;
213
214 if (commit_graft_prepared)
215 return;
216 graft_file = get_graft_file();
217 read_graft_file(graft_file);
ed09aef0
JS
218 /* make sure shallows are read */
219 is_repository_shallow();
5040f17e 220 commit_graft_prepared = 1;
5da5c8f4
JH
221}
222
45163382 223struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
5da5c8f4
JH
224{
225 int pos;
5040f17e 226 prepare_commit_graft();
5da5c8f4
JH
227 pos = commit_graft_pos(sha1);
228 if (pos < 0)
229 return NULL;
230 return commit_graft[pos];
231}
232
09d46644 233int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
ed09aef0 234{
09d46644
NTND
235 int i, ret;
236 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
237 ret = fn(commit_graft[i], cb_data);
238 return ret;
ed09aef0
JS
239}
240
f53514bc
JS
241int unregister_shallow(const unsigned char *sha1)
242{
243 int pos = commit_graft_pos(sha1);
244 if (pos < 0)
245 return -1;
246 if (pos + 1 < commit_graft_nr)
65d41d48 247 memmove(commit_graft + pos, commit_graft + pos + 1,
f53514bc
JS
248 sizeof(struct commit_graft *)
249 * (commit_graft_nr - pos - 1));
250 commit_graft_nr--;
251 return 0;
252}
253
cf7b1cad 254int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
175785e5 255{
cf7b1cad
NTND
256 const char *tail = buffer;
257 const char *bufptr = buffer;
175785e5 258 unsigned char parent[20];
6c88be16 259 struct commit_list **pptr;
5da5c8f4 260 struct commit_graft *graft;
bd2c39f5 261
175785e5
DB
262 if (item->object.parsed)
263 return 0;
264 item->object.parsed = 1;
3b44f15a 265 tail += size;
0a617799 266 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
f7cc77d7 267 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
0a617799 268 if (get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde8
JH
269 return error("bad tree pointer in commit %s",
270 sha1_to_hex(item->object.sha1));
175785e5 271 item->tree = lookup_tree(parent);
175785e5 272 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 273 pptr = &item->parents;
5da5c8f4
JH
274
275 graft = lookup_commit_graft(item->object.sha1);
3b44f15a 276 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
f7cc77d7
LT
277 struct commit *new_parent;
278
3b44f15a
JH
279 if (tail <= bufptr + 48 ||
280 get_sha1_hex(bufptr + 7, parent) ||
281 bufptr[47] != '\n')
f7cc77d7 282 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4 283 bufptr += 48;
7f3140cd
JS
284 /*
285 * The clone is shallow if nr_parent < 0, and we must
286 * not traverse its real parents even when we unhide them.
287 */
288 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
5da5c8f4 289 continue;
f7cc77d7 290 new_parent = lookup_commit(parent);
39468def 291 if (new_parent)
6c88be16 292 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4
JH
293 }
294 if (graft) {
295 int i;
296 struct commit *new_parent;
297 for (i = 0; i < graft->nr_parent; i++) {
298 new_parent = lookup_commit(graft->parent[i]);
299 if (!new_parent)
300 continue;
301 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4 302 }
175785e5 303 }
0a617799 304 item->date = parse_commit_date(bufptr, tail);
27dedf0c 305
175785e5
DB
306 return 0;
307}
308
bd2c39f5
NP
309int parse_commit(struct commit *item)
310{
21666f1a 311 enum object_type type;
bd2c39f5
NP
312 void *buffer;
313 unsigned long size;
314 int ret;
315
9786f68b
MK
316 if (!item)
317 return -1;
bd2c39f5
NP
318 if (item->object.parsed)
319 return 0;
21666f1a 320 buffer = read_sha1_file(item->object.sha1, &type, &size);
bd2c39f5
NP
321 if (!buffer)
322 return error("Could not read %s",
323 sha1_to_hex(item->object.sha1));
21666f1a 324 if (type != OBJ_COMMIT) {
bd2c39f5
NP
325 free(buffer);
326 return error("Object %s not a commit",
327 sha1_to_hex(item->object.sha1));
328 }
329 ret = parse_commit_buffer(item, buffer, size);
60ab26de 330 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
331 item->buffer = buffer;
332 return 0;
333 }
bd2c39f5
NP
334 free(buffer);
335 return ret;
336}
337
11af2aae
CC
338int find_commit_subject(const char *commit_buffer, const char **subject)
339{
340 const char *eol;
341 const char *p = commit_buffer;
342
343 while (*p && (*p != '\n' || p[1] != '\n'))
344 p++;
345 if (*p) {
346 p += 2;
347 for (eol = p; *eol && *eol != '\n'; eol++)
348 ; /* do nothing */
349 } else
350 eol = p;
351
352 *subject = p;
353
354 return eol - p;
355}
356
ac5155ef 357struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 358{
812666c8 359 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
360 new_list->item = item;
361 new_list->next = *list_p;
362 *list_p = new_list;
ac5155ef 363 return new_list;
dd97f850
DB
364}
365
65319475
MV
366unsigned commit_list_count(const struct commit_list *l)
367{
368 unsigned c = 0;
369 for (; l; l = l->next )
370 c++;
371 return c;
372}
373
175785e5
DB
374void free_commit_list(struct commit_list *list)
375{
376 while (list) {
377 struct commit_list *temp = list;
378 list = temp->next;
379 free(temp);
380 }
381}
dd97f850 382
47e44ed1 383struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
384{
385 struct commit_list **pp = list;
386 struct commit_list *p;
387 while ((p = *pp) != NULL) {
388 if (p->item->date < item->date) {
389 break;
390 }
391 pp = &p->next;
392 }
f755494c 393 return commit_list_insert(item, pp);
dd97f850
DB
394}
395
46905893
RS
396static int commit_list_compare_by_date(const void *a, const void *b)
397{
398 unsigned long a_date = ((const struct commit_list *)a)->item->date;
399 unsigned long b_date = ((const struct commit_list *)b)->item->date;
400 if (a_date < b_date)
401 return 1;
402 if (a_date > b_date)
403 return -1;
404 return 0;
405}
406
407static void *commit_list_get_next(const void *a)
408{
409 return ((const struct commit_list *)a)->next;
410}
411
412static void commit_list_set_next(void *a, void *next)
413{
414 ((struct commit_list *)a)->next = next;
415}
a6080a0a 416
47e44ed1 417void commit_list_sort_by_date(struct commit_list **list)
dd97f850 418{
7365c95d
JH
419 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
420 commit_list_compare_by_date);
dd97f850
DB
421}
422
58e28af6
DB
423struct commit *pop_most_recent_commit(struct commit_list **list,
424 unsigned int mark)
dd97f850
DB
425{
426 struct commit *ret = (*list)->item;
427 struct commit_list *parents = ret->parents;
428 struct commit_list *old = *list;
429
430 *list = (*list)->next;
431 free(old);
432
433 while (parents) {
4056c091 434 struct commit *commit = parents->item;
dec38c81 435 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
58e28af6 436 commit->object.flags |= mark;
47e44ed1 437 commit_list_insert_by_date(commit, list);
4056c091 438 }
dd97f850
DB
439 parents = parents->next;
440 }
441 return ret;
442}
e3bc7a3b 443
941ba8db
NTND
444static void clear_commit_marks_1(struct commit_list **plist,
445 struct commit *commit, unsigned int mark)
f8f9c73c 446{
60fcc2e6
JS
447 while (commit) {
448 struct commit_list *parents;
f8f9c73c 449
60fcc2e6
JS
450 if (!(mark & commit->object.flags))
451 return;
58ecf5c1 452
60fcc2e6
JS
453 commit->object.flags &= ~mark;
454
455 parents = commit->parents;
456 if (!parents)
457 return;
458
459 while ((parents = parents->next))
941ba8db 460 commit_list_insert(parents->item, plist);
60fcc2e6
JS
461
462 commit = commit->parents->item;
f8f9c73c
JH
463 }
464}
465
e895cb51 466void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
941ba8db
NTND
467{
468 struct commit_list *list = NULL;
e895cb51
JH
469
470 while (nr--) {
471 commit_list_insert(*commit, &list);
472 commit++;
473 }
941ba8db
NTND
474 while (list)
475 clear_commit_marks_1(&list, pop_commit(&list), mark);
476}
477
e895cb51
JH
478void clear_commit_marks(struct commit *commit, unsigned int mark)
479{
480 clear_commit_marks_many(1, &commit, mark);
481}
482
86a0a408
RS
483void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
484{
485 struct object *object;
486 struct commit *commit;
487 unsigned int i;
488
489 for (i = 0; i < a->nr; i++) {
490 object = a->objects[i].item;
491 commit = lookup_commit_reference_gently(object->sha1, 1);
492 if (commit)
493 clear_commit_marks(commit, mark);
494 }
495}
496
a3437b8c
JS
497struct commit *pop_commit(struct commit_list **stack)
498{
499 struct commit_list *top = *stack;
500 struct commit *item = top ? top->item : NULL;
501
502 if (top) {
503 *stack = top->next;
504 free(top);
505 }
506 return item;
507}
508
ab580ace
JS
509/*
510 * Performs an in-place topological sort on the list supplied.
511 */
4c8725f1 512void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2 513{
23c17d4a
LT
514 struct commit_list *next, *orig = *list;
515 struct commit_list *work, **insert;
516 struct commit_list **pptr;
a6080a0a 517
23c17d4a 518 if (!orig)
7d6fb370 519 return;
23c17d4a
LT
520 *list = NULL;
521
522 /* Mark them and clear the indegree */
523 for (next = orig; next; next = next->next) {
524 struct commit *commit = next->item;
e358f3c3 525 commit->indegree = 1;
ab580ace 526 }
23c17d4a 527
ab580ace 528 /* update the indegree */
23c17d4a 529 for (next = orig; next; next = next->next) {
ab580ace
JS
530 struct commit_list * parents = next->item->parents;
531 while (parents) {
23c17d4a 532 struct commit *parent = parents->item;
6b6dcfc2 533
e358f3c3 534 if (parent->indegree)
23c17d4a
LT
535 parent->indegree++;
536 parents = parents->next;
ab580ace 537 }
ab580ace 538 }
23c17d4a 539
a6080a0a 540 /*
674d1727
PH
541 * find the tips
542 *
543 * tips are nodes not reachable from any other node in the list
544 *
545 * the tips serve as a starting set for the work queue.
546 */
23c17d4a 547 work = NULL;
2ed02887 548 insert = &work;
23c17d4a
LT
549 for (next = orig; next; next = next->next) {
550 struct commit *commit = next->item;
ab580ace 551
e358f3c3 552 if (commit->indegree == 1)
23c17d4a 553 insert = &commit_list_insert(commit, insert)->next;
ab580ace 554 }
4c8725f1 555
ab580ace 556 /* process the list in topological order */
4c8725f1 557 if (!lifo)
47e44ed1 558 commit_list_sort_by_date(&work);
23c17d4a
LT
559
560 pptr = list;
561 *list = NULL;
ab580ace 562 while (work) {
23c17d4a
LT
563 struct commit *commit;
564 struct commit_list *parents, *work_item;
ab580ace 565
23c17d4a
LT
566 work_item = work;
567 work = work_item->next;
568 work_item->next = NULL;
569
570 commit = work_item->item;
571 for (parents = commit->parents; parents ; parents = parents->next) {
cd2b8ae9 572 struct commit *parent = parents->item;
23c17d4a 573
e358f3c3 574 if (!parent->indegree)
23c17d4a
LT
575 continue;
576
577 /*
578 * parents are only enqueued for emission
579 * when all their children have been emitted thereby
580 * guaranteeing topological order.
581 */
e358f3c3 582 if (--parent->indegree == 1) {
23c17d4a 583 if (!lifo)
47e44ed1 584 commit_list_insert_by_date(parent, &work);
23c17d4a
LT
585 else
586 commit_list_insert(parent, &work);
ab580ace 587 }
ab580ace
JS
588 }
589 /*
674d1727
PH
590 * work_item is a commit all of whose children
591 * have already been emitted. we can emit it now.
592 */
e358f3c3 593 commit->indegree = 0;
23c17d4a
LT
594 *pptr = work_item;
595 pptr = &work_item->next;
ab580ace 596 }
ab580ace 597}
7c6f8aaf 598
1295228d 599/* merge-base stuff */
7c6f8aaf 600
577ed5c2
JH
601/* bits #0..15 in revision.h */
602#define PARENT1 (1u<<16)
603#define PARENT2 (1u<<17)
604#define STALE (1u<<18)
605#define RESULT (1u<<19)
7c6f8aaf 606
1295228d
JH
607static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
608
7c6f8aaf
JS
609static struct commit *interesting(struct commit_list *list)
610{
611 while (list) {
612 struct commit *commit = list->item;
613 list = list->next;
542ccefe 614 if (commit->object.flags & STALE)
7c6f8aaf
JS
615 continue;
616 return commit;
617 }
618 return NULL;
619}
620
d866924a 621/* all input commits in one and twos[] must have been parsed! */
da1f5156 622static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
7c6f8aaf
JS
623{
624 struct commit_list *list = NULL;
625 struct commit_list *result = NULL;
6a938648 626 int i;
7c6f8aaf 627
f3249438 628 one->object.flags |= PARENT1;
47e44ed1 629 commit_list_insert_by_date(one, &list);
d866924a
JH
630 if (!n)
631 return list;
6a938648
JH
632 for (i = 0; i < n; i++) {
633 twos[i]->object.flags |= PARENT2;
47e44ed1 634 commit_list_insert_by_date(twos[i], &list);
6a938648 635 }
7c6f8aaf
JS
636
637 while (interesting(list)) {
f3249438 638 struct commit *commit;
7c6f8aaf 639 struct commit_list *parents;
f203d696 640 struct commit_list *next;
f3249438 641 int flags;
7c6f8aaf 642
f3249438 643 commit = list->item;
f203d696 644 next = list->next;
f3249438 645 free(list);
f203d696 646 list = next;
7c6f8aaf 647
f3249438
JH
648 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
649 if (flags == (PARENT1 | PARENT2)) {
650 if (!(commit->object.flags & RESULT)) {
651 commit->object.flags |= RESULT;
47e44ed1 652 commit_list_insert_by_date(commit, &result);
f3249438 653 }
542ccefe
JH
654 /* Mark parents of a found merge stale */
655 flags |= STALE;
7c6f8aaf
JS
656 }
657 parents = commit->parents;
658 while (parents) {
659 struct commit *p = parents->item;
660 parents = parents->next;
661 if ((p->object.flags & flags) == flags)
662 continue;
172947e6
MK
663 if (parse_commit(p))
664 return NULL;
7c6f8aaf 665 p->object.flags |= flags;
47e44ed1 666 commit_list_insert_by_date(p, &list);
7c6f8aaf
JS
667 }
668 }
669
1295228d 670 free_commit_list(list);
da1f5156
JH
671 return result;
672}
673
674static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
675{
676 struct commit_list *list = NULL;
677 struct commit_list *result = NULL;
678 int i;
679
680 for (i = 0; i < n; i++) {
681 if (one == twos[i])
682 /*
683 * We do not mark this even with RESULT so we do not
684 * have to clean it up.
685 */
686 return commit_list_insert(one, &result);
687 }
688
689 if (parse_commit(one))
690 return NULL;
691 for (i = 0; i < n; i++) {
692 if (parse_commit(twos[i]))
693 return NULL;
694 }
695
696 list = paint_down_to_common(one, n, twos);
697
f3249438 698 while (list) {
f203d696 699 struct commit_list *next = list->next;
f3249438 700 if (!(list->item->object.flags & STALE))
47e44ed1 701 commit_list_insert_by_date(list->item, &result);
f3249438 702 free(list);
f203d696 703 list = next;
f3249438
JH
704 }
705 return result;
706}
7c6f8aaf 707
5240c9d7
MV
708struct commit_list *get_octopus_merge_bases(struct commit_list *in)
709{
710 struct commit_list *i, *j, *k, *ret = NULL;
711 struct commit_list **pptr = &ret;
712
713 for (i = in; i; i = i->next) {
714 if (!ret)
715 pptr = &commit_list_insert(i->item, pptr)->next;
716 else {
717 struct commit_list *new = NULL, *end = NULL;
718
719 for (j = ret; j; j = j->next) {
720 struct commit_list *bases;
721 bases = get_merge_bases(i->item, j->item, 1);
722 if (!new)
723 new = bases;
724 else
725 end->next = bases;
726 for (k = bases; k; k = k->next)
727 end = k;
728 }
729 ret = new;
730 }
731 }
732 return ret;
733}
734
94f0ced0
JH
735static int remove_redundant(struct commit **array, int cnt)
736{
737 /*
738 * Some commit in the array may be an ancestor of
739 * another commit. Move such commit to the end of
740 * the array, and return the number of commits that
741 * are independent from each other.
742 */
743 struct commit **work;
744 unsigned char *redundant;
745 int *filled_index;
746 int i, j, filled;
747
748 work = xcalloc(cnt, sizeof(*work));
749 redundant = xcalloc(cnt, 1);
750 filled_index = xmalloc(sizeof(*filled_index) * (cnt - 1));
751
d866924a
JH
752 for (i = 0; i < cnt; i++)
753 parse_commit(array[i]);
94f0ced0
JH
754 for (i = 0; i < cnt; i++) {
755 struct commit_list *common;
756
757 if (redundant[i])
758 continue;
759 for (j = filled = 0; j < cnt; j++) {
760 if (i == j || redundant[j])
761 continue;
762 filled_index[filled] = j;
763 work[filled++] = array[j];
764 }
765 common = paint_down_to_common(array[i], filled, work);
766 if (array[i]->object.flags & PARENT2)
767 redundant[i] = 1;
768 for (j = 0; j < filled; j++)
769 if (work[j]->object.flags & PARENT1)
770 redundant[filled_index[j]] = 1;
771 clear_commit_marks(array[i], all_flags);
772 for (j = 0; j < filled; j++)
773 clear_commit_marks(work[j], all_flags);
774 free_commit_list(common);
775 }
776
777 /* Now collect the result */
778 memcpy(work, array, sizeof(*array) * cnt);
779 for (i = filled = 0; i < cnt; i++)
780 if (!redundant[i])
781 array[filled++] = work[i];
782 for (j = filled, i = 0; i < cnt; i++)
783 if (redundant[i])
784 array[j++] = work[i];
785 free(work);
786 free(redundant);
787 free(filled_index);
788 return filled;
789}
790
6a938648
JH
791struct commit_list *get_merge_bases_many(struct commit *one,
792 int n,
793 struct commit **twos,
794 int cleanup)
f3249438 795{
f3249438
JH
796 struct commit_list *list;
797 struct commit **rslt;
798 struct commit_list *result;
94f0ced0 799 int cnt, i;
f3249438 800
6a938648
JH
801 result = merge_bases_many(one, n, twos);
802 for (i = 0; i < n; i++) {
803 if (one == twos[i])
804 return result;
805 }
f3249438
JH
806 if (!result || !result->next) {
807 if (cleanup) {
808 clear_commit_marks(one, all_flags);
e895cb51 809 clear_commit_marks_many(n, twos, all_flags);
7c6f8aaf 810 }
f3249438 811 return result;
7c6f8aaf
JS
812 }
813
f3249438
JH
814 /* There are more than one */
815 cnt = 0;
816 list = result;
817 while (list) {
818 list = list->next;
819 cnt++;
820 }
821 rslt = xcalloc(cnt, sizeof(*rslt));
822 for (list = result, i = 0; list; list = list->next)
823 rslt[i++] = list->item;
824 free_commit_list(result);
825
826 clear_commit_marks(one, all_flags);
e895cb51 827 clear_commit_marks_many(n, twos, all_flags);
7c6f8aaf 828
94f0ced0 829 cnt = remove_redundant(rslt, cnt);
f3249438 830 result = NULL;
94f0ced0
JH
831 for (i = 0; i < cnt; i++)
832 commit_list_insert_by_date(rslt[i], &result);
f3249438 833 free(rslt);
7c6f8aaf
JS
834 return result;
835}
2ecd2bbc 836
6a938648
JH
837struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
838 int cleanup)
839{
840 return get_merge_bases_many(one, 1, &two, cleanup);
841}
842
a20efee9
JH
843/*
844 * Is "commit" a decendant of one of the elements on the "with_commit" list?
845 */
7fcdb36e
JG
846int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
847{
848 if (!with_commit)
849 return 1;
850 while (with_commit) {
851 struct commit *other;
852
853 other = with_commit->item;
854 with_commit = with_commit->next;
a20efee9 855 if (in_merge_bases(other, commit))
7fcdb36e
JG
856 return 1;
857 }
858 return 0;
859}
860
a20efee9 861/*
4c4b27e8 862 * Is "commit" an ancestor of one of the "references"?
a20efee9 863 */
4c4b27e8 864int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
2ecd2bbc 865{
6440fdba 866 struct commit_list *bases;
4c4b27e8 867 int ret = 0, i;
2ecd2bbc 868
4c4b27e8 869 if (parse_commit(commit))
6440fdba 870 return ret;
4c4b27e8
JH
871 for (i = 0; i < nr_reference; i++)
872 if (parse_commit(reference[i]))
873 return ret;
2ecd2bbc 874
4c4b27e8 875 bases = paint_down_to_common(commit, nr_reference, reference);
6440fdba
JH
876 if (commit->object.flags & PARENT2)
877 ret = 1;
b0f9e9ee 878 clear_commit_marks(commit, all_flags);
557899ff 879 clear_commit_marks_many(nr_reference, reference, all_flags);
2ecd2bbc
JH
880 free_commit_list(bases);
881 return ret;
882}
98cf9c3b 883
4c4b27e8
JH
884/*
885 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
886 */
887int in_merge_bases(struct commit *commit, struct commit *reference)
888{
889 return in_merge_bases_many(commit, 1, &reference);
890}
891
98cf9c3b
JH
892struct commit_list *reduce_heads(struct commit_list *heads)
893{
894 struct commit_list *p;
895 struct commit_list *result = NULL, **tail = &result;
f37d3c75
JH
896 struct commit **array;
897 int num_head, i;
98cf9c3b
JH
898
899 if (!heads)
900 return NULL;
901
f37d3c75
JH
902 /* Uniquify */
903 for (p = heads; p; p = p->next)
904 p->item->object.flags &= ~STALE;
905 for (p = heads, num_head = 0; p; p = p->next) {
906 if (p->item->object.flags & STALE)
711f6b29 907 continue;
f37d3c75
JH
908 p->item->object.flags |= STALE;
909 num_head++;
910 }
911 array = xcalloc(sizeof(*array), num_head);
912 for (p = heads, i = 0; p; p = p->next) {
913 if (p->item->object.flags & STALE) {
914 array[i++] = p->item;
915 p->item->object.flags &= ~STALE;
98cf9c3b 916 }
98cf9c3b 917 }
f37d3c75
JH
918 num_head = remove_redundant(array, num_head);
919 for (i = 0; i < num_head; i++)
920 tail = &commit_list_insert(array[i], tail)->next;
98cf9c3b
JH
921 return result;
922}
40d52ff7 923
ba3c69a9
JH
924static const char gpg_sig_header[] = "gpgsig";
925static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
926
927static int do_sign_commit(struct strbuf *buf, const char *keyid)
928{
929 struct strbuf sig = STRBUF_INIT;
930 int inspos, copypos;
931
932 /* find the end of the header */
933 inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
934
935 if (!keyid || !*keyid)
936 keyid = get_signing_key();
937 if (sign_buffer(buf, &sig, keyid)) {
938 strbuf_release(&sig);
939 return -1;
940 }
941
942 for (copypos = 0; sig.buf[copypos]; ) {
943 const char *bol = sig.buf + copypos;
944 const char *eol = strchrnul(bol, '\n');
945 int len = (eol - bol) + !!*eol;
946
947 if (!copypos) {
948 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
949 inspos += gpg_sig_header_len;
950 }
951 strbuf_insert(buf, inspos++, " ", 1);
952 strbuf_insert(buf, inspos, bol, len);
953 inspos += len;
954 copypos += len;
955 }
956 strbuf_release(&sig);
957 return 0;
958}
959
0c37f1fc
JH
960int parse_signed_commit(const unsigned char *sha1,
961 struct strbuf *payload, struct strbuf *signature)
962{
963 unsigned long size;
964 enum object_type type;
965 char *buffer = read_sha1_file(sha1, &type, &size);
966 int in_signature, saw_signature = -1;
967 char *line, *tail;
968
969 if (!buffer || type != OBJ_COMMIT)
970 goto cleanup;
971
972 line = buffer;
973 tail = buffer + size;
974 in_signature = 0;
975 saw_signature = 0;
976 while (line < tail) {
977 const char *sig = NULL;
978 char *next = memchr(line, '\n', tail - line);
979
980 next = next ? next + 1 : tail;
981 if (in_signature && line[0] == ' ')
982 sig = line + 1;
983 else if (!prefixcmp(line, gpg_sig_header) &&
984 line[gpg_sig_header_len] == ' ')
985 sig = line + gpg_sig_header_len + 1;
986 if (sig) {
987 strbuf_add(signature, sig, next - sig);
988 saw_signature = 1;
989 in_signature = 1;
990 } else {
991 if (*line == '\n')
992 /* dump the whole remainder of the buffer */
993 next = tail;
994 strbuf_add(payload, line, next - line);
995 in_signature = 0;
996 }
997 line = next;
998 }
999 cleanup:
1000 free(buffer);
1001 return saw_signature;
1002}
1003
5231c633
JH
1004static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1005{
1006 struct merge_remote_desc *desc;
1007 struct commit_extra_header *mergetag;
1008 char *buf;
1009 unsigned long size, len;
1010 enum object_type type;
1011
1012 desc = merge_remote_util(parent);
1013 if (!desc || !desc->obj)
1014 return;
1015 buf = read_sha1_file(desc->obj->sha1, &type, &size);
1016 if (!buf || type != OBJ_TAG)
1017 goto free_return;
1018 len = parse_signature(buf, size);
1019 if (size == len)
1020 goto free_return;
1021 /*
1022 * We could verify this signature and either omit the tag when
1023 * it does not validate, but the integrator may not have the
1024 * public key of the signer of the tag he is merging, while a
1025 * later auditor may have it while auditing, so let's not run
1026 * verify-signed-buffer here for now...
1027 *
1028 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1029 * warn("warning: signed tag unverified.");
1030 */
1031 mergetag = xcalloc(1, sizeof(*mergetag));
1032 mergetag->key = xstrdup("mergetag");
1033 mergetag->value = buf;
1034 mergetag->len = size;
1035
1036 **tail = mergetag;
1037 *tail = &mergetag->next;
1038 return;
1039
1040free_return:
1041 free(buf);
1042}
1043
ffb6d7d5
SG
1044static struct {
1045 char result;
1046 const char *check;
1047} sigcheck_gpg_status[] = {
1048 { 'G', "\n[GNUPG:] GOODSIG " },
1049 { 'B', "\n[GNUPG:] BADSIG " },
1050};
1051
1052static void parse_gpg_output(struct signature_check *sigc)
1053{
1054 const char *buf = sigc->gpg_status;
1055 int i;
1056
f8aae8d0 1057 /* Iterate over all search strings */
ffb6d7d5 1058 for (i = 0; i < ARRAY_SIZE(sigcheck_gpg_status); i++) {
f8aae8d0
SG
1059 const char *found, *next;
1060
1061 if (!prefixcmp(buf, sigcheck_gpg_status[i].check + 1)) {
1062 /* At the very beginning of the buffer */
1063 found = buf + strlen(sigcheck_gpg_status[i].check + 1);
1064 } else {
1065 found = strstr(buf, sigcheck_gpg_status[i].check);
1066 if (!found)
1067 continue;
1068 found += strlen(sigcheck_gpg_status[i].check);
1069 }
ffb6d7d5 1070 sigc->result = sigcheck_gpg_status[i].result;
ffb6d7d5
SG
1071 sigc->key = xmemdupz(found, 16);
1072 found += 17;
1073 next = strchrnul(found, '\n');
1074 sigc->signer = xmemdupz(found, next - found);
1075 break;
1076 }
1077}
1078
1079void check_commit_signature(const struct commit* commit, struct signature_check *sigc)
1080{
1081 struct strbuf payload = STRBUF_INIT;
1082 struct strbuf signature = STRBUF_INIT;
1083 struct strbuf gpg_output = STRBUF_INIT;
1084 struct strbuf gpg_status = STRBUF_INIT;
1085 int status;
1086
1087 sigc->result = 'N';
1088
1089 if (parse_signed_commit(commit->object.sha1,
1090 &payload, &signature) <= 0)
1091 goto out;
1092 status = verify_signed_buffer(payload.buf, payload.len,
1093 signature.buf, signature.len,
1094 &gpg_output, &gpg_status);
1095 if (status && !gpg_output.len)
1096 goto out;
1097 sigc->gpg_output = strbuf_detach(&gpg_output, NULL);
1098 sigc->gpg_status = strbuf_detach(&gpg_status, NULL);
1099 parse_gpg_output(sigc);
1100
1101 out:
1102 strbuf_release(&gpg_status);
1103 strbuf_release(&gpg_output);
1104 strbuf_release(&payload);
1105 strbuf_release(&signature);
1106}
1107
1108
1109
5231c633
JH
1110void append_merge_tag_headers(struct commit_list *parents,
1111 struct commit_extra_header ***tail)
1112{
1113 while (parents) {
1114 struct commit *parent = parents->item;
1115 handle_signed_tag(parent, tail);
1116 parents = parents->next;
1117 }
1118}
1119
1120static void add_extra_header(struct strbuf *buffer,
1121 struct commit_extra_header *extra)
1122{
1123 strbuf_addstr(buffer, extra->key);
ed7a42a0
JH
1124 if (extra->len)
1125 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1126 else
1127 strbuf_addch(buffer, '\n');
1128}
1129
c871a1d1
JH
1130struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1131 const char **exclude)
ed7a42a0
JH
1132{
1133 struct commit_extra_header *extra = NULL;
1134 unsigned long size;
1135 enum object_type type;
1136 char *buffer = read_sha1_file(commit->object.sha1, &type, &size);
1137 if (buffer && type == OBJ_COMMIT)
c871a1d1 1138 extra = read_commit_extra_header_lines(buffer, size, exclude);
ed7a42a0
JH
1139 free(buffer);
1140 return extra;
1141}
1142
1143static inline int standard_header_field(const char *field, size_t len)
1144{
1145 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
1146 (len == 6 && !memcmp(field, "parent ", 7)) ||
1147 (len == 6 && !memcmp(field, "author ", 7)) ||
1148 (len == 9 && !memcmp(field, "committer ", 10)) ||
1149 (len == 8 && !memcmp(field, "encoding ", 9)));
1150}
1151
c871a1d1
JH
1152static int excluded_header_field(const char *field, size_t len, const char **exclude)
1153{
1154 if (!exclude)
1155 return 0;
1156
1157 while (*exclude) {
1158 size_t xlen = strlen(*exclude);
1159 if (len == xlen &&
1160 !memcmp(field, *exclude, xlen) && field[xlen] == ' ')
1161 return 1;
1162 exclude++;
1163 }
1164 return 0;
1165}
1166
82a75299
JH
1167static struct commit_extra_header *read_commit_extra_header_lines(
1168 const char *buffer, size_t size,
1169 const char **exclude)
ed7a42a0
JH
1170{
1171 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1172 const char *line, *next, *eof, *eob;
1173 struct strbuf buf = STRBUF_INIT;
1174
1175 for (line = buffer, eob = line + size;
1176 line < eob && *line != '\n';
1177 line = next) {
1178 next = memchr(line, '\n', eob - line);
1179 next = next ? next + 1 : eob;
1180 if (*line == ' ') {
1181 /* continuation */
1182 if (it)
1183 strbuf_add(&buf, line + 1, next - (line + 1));
1184 continue;
1185 }
1186 if (it)
1187 it->value = strbuf_detach(&buf, &it->len);
1188 strbuf_reset(&buf);
1189 it = NULL;
1190
1191 eof = strchr(line, ' ');
1192 if (next <= eof)
1193 eof = next;
1194
c871a1d1
JH
1195 if (standard_header_field(line, eof - line) ||
1196 excluded_header_field(line, eof - line, exclude))
ed7a42a0
JH
1197 continue;
1198
1199 it = xcalloc(1, sizeof(*it));
1200 it->key = xmemdupz(line, eof-line);
1201 *tail = it;
1202 tail = &it->next;
1203 if (eof + 1 < next)
1204 strbuf_add(&buf, eof + 1, next - (eof + 1));
1205 }
1206 if (it)
1207 it->value = strbuf_detach(&buf, &it->len);
1208 return extra;
5231c633
JH
1209}
1210
1211void free_commit_extra_headers(struct commit_extra_header *extra)
1212{
1213 while (extra) {
1214 struct commit_extra_header *next = extra->next;
1215 free(extra->key);
1216 free(extra->value);
1217 free(extra);
1218 extra = next;
1219 }
1220}
1221
f35ccd9b 1222int commit_tree(const struct strbuf *msg, unsigned char *tree,
5231c633 1223 struct commit_list *parents, unsigned char *ret,
ba3c69a9 1224 const char *author, const char *sign_commit)
5231c633
JH
1225{
1226 struct commit_extra_header *extra = NULL, **tail = &extra;
1227 int result;
1228
1229 append_merge_tag_headers(parents, &tail);
ba3c69a9
JH
1230 result = commit_tree_extended(msg, tree, parents, ret,
1231 author, sign_commit, extra);
5231c633
JH
1232 free_commit_extra_headers(extra);
1233 return result;
1234}
1235
08a94a14
LT
1236static int find_invalid_utf8(const char *buf, int len)
1237{
1238 int offset = 0;
1239
1240 while (len) {
1241 unsigned char c = *buf++;
1242 int bytes, bad_offset;
1243
1244 len--;
1245 offset++;
1246
1247 /* Simple US-ASCII? No worries. */
1248 if (c < 0x80)
1249 continue;
1250
1251 bad_offset = offset-1;
1252
1253 /*
1254 * Count how many more high bits set: that's how
1255 * many more bytes this sequence should have.
1256 */
1257 bytes = 0;
1258 while (c & 0x40) {
1259 c <<= 1;
1260 bytes++;
1261 }
1262
1263 /* Must be between 1 and 5 more bytes */
1264 if (bytes < 1 || bytes > 5)
1265 return bad_offset;
1266
1267 /* Do we *have* that many bytes? */
1268 if (len < bytes)
1269 return bad_offset;
1270
1271 offset += bytes;
1272 len -= bytes;
1273
1274 /* And verify that they are good continuation bytes */
1275 do {
1276 if ((*buf++ & 0xc0) != 0x80)
1277 return bad_offset;
1278 } while (--bytes);
1279
1280 /* We could/should check the value and length here too */
1281 }
1282 return -1;
1283}
1284
1285/*
1286 * This verifies that the buffer is in proper utf8 format.
1287 *
1288 * If it isn't, it assumes any non-utf8 characters are Latin1,
1289 * and does the conversion.
1290 *
1291 * Fixme: we should probably also disallow overlong forms and
1292 * invalid characters. But we don't do that currently.
1293 */
1294static int verify_utf8(struct strbuf *buf)
1295{
1296 int ok = 1;
1297 long pos = 0;
1298
1299 for (;;) {
1300 int bad;
1301 unsigned char c;
1302 unsigned char replace[2];
1303
1304 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1305 if (bad < 0)
1306 return ok;
1307 pos += bad;
1308 ok = 0;
1309 c = buf->buf[pos];
1310 strbuf_remove(buf, pos, 1);
1311
1312 /* We know 'c' must be in the range 128-255 */
1313 replace[0] = 0xc0 + (c >> 6);
1314 replace[1] = 0x80 + (c & 0x3f);
1315 strbuf_insert(buf, pos, replace, 2);
1316 pos += 2;
1317 }
1318}
1319
40d52ff7 1320static const char commit_utf8_warn[] =
08a94a14 1321"Warning: commit message did not conform to UTF-8.\n"
40d52ff7
JK
1322"You may want to amend it after fixing the message, or set the config\n"
1323"variable i18n.commitencoding to the encoding your project uses.\n";
1324
f35ccd9b 1325int commit_tree_extended(const struct strbuf *msg, unsigned char *tree,
5231c633 1326 struct commit_list *parents, unsigned char *ret,
ba3c69a9
JH
1327 const char *author, const char *sign_commit,
1328 struct commit_extra_header *extra)
40d52ff7
JK
1329{
1330 int result;
1331 int encoding_is_utf8;
1332 struct strbuf buffer;
1333
1334 assert_sha1_type(tree, OBJ_TREE);
1335
37576c14
NTND
1336 if (memchr(msg->buf, '\0', msg->len))
1337 return error("a NUL byte in commit log message not allowed.");
1338
40d52ff7
JK
1339 /* Not having i18n.commitencoding is the same as having utf-8 */
1340 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1341
1342 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1343 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1344
1345 /*
1346 * NOTE! This ordering means that the same exact tree merged with a
1347 * different order of parents will be a _different_ changeset even
1348 * if everything else stays the same.
1349 */
1350 while (parents) {
1351 struct commit_list *next = parents->next;
5231c633
JH
1352 struct commit *parent = parents->item;
1353
40d52ff7 1354 strbuf_addf(&buffer, "parent %s\n",
5231c633 1355 sha1_to_hex(parent->object.sha1));
40d52ff7
JK
1356 free(parents);
1357 parents = next;
1358 }
1359
1360 /* Person/date information */
1361 if (!author)
f9bc573f 1362 author = git_author_info(IDENT_STRICT);
40d52ff7 1363 strbuf_addf(&buffer, "author %s\n", author);
f9bc573f 1364 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
40d52ff7
JK
1365 if (!encoding_is_utf8)
1366 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
5231c633
JH
1367
1368 while (extra) {
1369 add_extra_header(&buffer, extra);
1370 extra = extra->next;
1371 }
40d52ff7
JK
1372 strbuf_addch(&buffer, '\n');
1373
1374 /* And add the comment */
13f8b72d 1375 strbuf_addbuf(&buffer, msg);
40d52ff7
JK
1376
1377 /* And check the encoding */
08a94a14 1378 if (encoding_is_utf8 && !verify_utf8(&buffer))
40d52ff7
JK
1379 fprintf(stderr, commit_utf8_warn);
1380
ba3c69a9
JH
1381 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1382 return -1;
1383
40d52ff7
JK
1384 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1385 strbuf_release(&buffer);
1386 return result;
1387}
ae8e4c9c
JH
1388
1389struct commit *get_merge_parent(const char *name)
1390{
1391 struct object *obj;
1392 struct commit *commit;
1393 unsigned char sha1[20];
1394 if (get_sha1(name, sha1))
1395 return NULL;
1396 obj = parse_object(sha1);
1397 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1398 if (commit && !commit->util) {
1399 struct merge_remote_desc *desc;
1400 desc = xmalloc(sizeof(*desc));
1401 desc->obj = obj;
1402 desc->name = strdup(name);
1403 commit->util = desc;
1404 }
1405 return commit;
1406}
89b5f1d9
RS
1407
1408/*
1409 * Append a commit to the end of the commit_list.
1410 *
1411 * next starts by pointing to the variable that holds the head of an
1412 * empty commit_list, and is updated to point to the "next" field of
1413 * the last item on the list as new commits are appended.
1414 *
1415 * Usage example:
1416 *
1417 * struct commit_list *list;
1418 * struct commit_list **next = &list;
1419 *
1420 * next = commit_list_append(c1, next);
1421 * next = commit_list_append(c2, next);
1422 * assert(commit_list_count(list) == 2);
1423 * return list;
1424 */
1425struct commit_list **commit_list_append(struct commit *commit,
1426 struct commit_list **next)
1427{
1428 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1429 new->item = commit;
1430 *next = new;
1431 new->next = NULL;
1432 return &new->next;
1433}
efc7df45
NTND
1434
1435void print_commit_list(struct commit_list *list,
1436 const char *format_cur,
1437 const char *format_last)
1438{
1439 for ( ; list; list = list->next) {
1440 const char *format = list->next ? format_cur : format_last;
1441 printf(format, sha1_to_hex(list->item->object.sha1));
1442 }
1443}