commit: teach --gpg-sign option
[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"
175785e5 10
60ab26de
LT
11int save_commit_buffer = 1;
12
175785e5
DB
13const char *commit_type = "commit";
14
f76412ed
JH
15static struct commit *check_commit(struct object *obj,
16 const unsigned char *sha1,
17 int quiet)
961784ee 18{
1974632c 19 if (obj->type != OBJ_COMMIT) {
f76412ed
JH
20 if (!quiet)
21 error("Object %s is a %s, not a commit",
885a86ab 22 sha1_to_hex(sha1), typename(obj->type));
961784ee
LT
23 return NULL;
24 }
25 return (struct commit *) obj;
26}
27
f76412ed
JH
28struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
29 int quiet)
961784ee 30{
9534f40b 31 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
32
33 if (!obj)
34 return NULL;
f76412ed
JH
35 return check_commit(obj, sha1, quiet);
36}
37
38struct commit *lookup_commit_reference(const unsigned char *sha1)
39{
40 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
41}
42
baf18fc2
NTND
43struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
44{
45 struct commit *c = lookup_commit_reference(sha1);
46 if (!c)
47 die(_("could not parse %s"), ref_name);
48 if (hashcmp(sha1, c->object.sha1)) {
49 warning(_("%s %s is not a commit!"),
50 ref_name, sha1_to_hex(sha1));
51 }
52 return c;
53}
54
5d6ccf5c 55struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
56{
57 struct object *obj = lookup_object(sha1);
100c5f3b
LT
58 if (!obj)
59 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
d1af002d 60 if (!obj->type)
1974632c 61 obj->type = OBJ_COMMIT;
f76412ed 62 return check_commit(obj, sha1, 0);
175785e5
DB
63}
64
a6fa5992
PN
65struct commit *lookup_commit_reference_by_name(const char *name)
66{
67 unsigned char sha1[20];
68 struct commit *commit;
69
70 if (get_sha1(name, sha1))
71 return NULL;
72 commit = lookup_commit_reference(sha1);
73 if (!commit || parse_commit(commit))
74 return NULL;
75 return commit;
76}
77
0a617799 78static unsigned long parse_commit_date(const char *buf, const char *tail)
175785e5 79{
0a617799 80 const char *dateptr;
175785e5 81
0a617799
MK
82 if (buf + 6 >= tail)
83 return 0;
175785e5
DB
84 if (memcmp(buf, "author", 6))
85 return 0;
0a617799 86 while (buf < tail && *buf++ != '\n')
175785e5 87 /* nada */;
0a617799
MK
88 if (buf + 9 >= tail)
89 return 0;
175785e5
DB
90 if (memcmp(buf, "committer", 9))
91 return 0;
0a617799 92 while (buf < tail && *buf++ != '>')
175785e5 93 /* nada */;
0a617799
MK
94 if (buf >= tail)
95 return 0;
96 dateptr = buf;
97 while (buf < tail && *buf++ != '\n')
98 /* nada */;
99 if (buf >= tail)
100 return 0;
101 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
f2909743 102 return strtoul(dateptr, NULL, 10);
175785e5
DB
103}
104
5040f17e 105static struct commit_graft **commit_graft;
5da5c8f4
JH
106static int commit_graft_alloc, commit_graft_nr;
107
108static int commit_graft_pos(const unsigned char *sha1)
109{
110 int lo, hi;
111 lo = 0;
112 hi = commit_graft_nr;
113 while (lo < hi) {
114 int mi = (lo + hi) / 2;
115 struct commit_graft *graft = commit_graft[mi];
a89fccd2 116 int cmp = hashcmp(sha1, graft->sha1);
5da5c8f4
JH
117 if (!cmp)
118 return mi;
119 if (cmp < 0)
120 hi = mi;
121 else
122 lo = mi + 1;
123 }
124 return -lo - 1;
125}
126
5040f17e
JH
127int register_commit_graft(struct commit_graft *graft, int ignore_dups)
128{
129 int pos = commit_graft_pos(graft->sha1);
a6080a0a 130
5040f17e
JH
131 if (0 <= pos) {
132 if (ignore_dups)
133 free(graft);
134 else {
135 free(commit_graft[pos]);
136 commit_graft[pos] = graft;
137 }
138 return 1;
139 }
140 pos = -pos - 1;
141 if (commit_graft_alloc <= ++commit_graft_nr) {
142 commit_graft_alloc = alloc_nr(commit_graft_alloc);
143 commit_graft = xrealloc(commit_graft,
144 sizeof(*commit_graft) *
145 commit_graft_alloc);
146 }
147 if (pos < commit_graft_nr)
148 memmove(commit_graft + pos + 1,
149 commit_graft + pos,
150 (commit_graft_nr - pos - 1) *
151 sizeof(*commit_graft));
152 commit_graft[pos] = graft;
153 return 0;
154}
155
156struct commit_graft *read_graft_line(char *buf, int len)
157{
158 /* The format is just "Commit Parent1 Parent2 ...\n" */
159 int i;
160 struct commit_graft *graft = NULL;
161
fe0a3cb2
JH
162 while (len && isspace(buf[len-1]))
163 buf[--len] = '\0';
360204c3 164 if (buf[0] == '#' || buf[0] == '\0')
5bc4ce58 165 return NULL;
df5d43be
RT
166 if ((len + 1) % 41)
167 goto bad_graft_data;
5040f17e
JH
168 i = (len + 1) / 41 - 1;
169 graft = xmalloc(sizeof(*graft) + 20 * i);
170 graft->nr_parent = i;
171 if (get_sha1_hex(buf, graft->sha1))
172 goto bad_graft_data;
173 for (i = 40; i < len; i += 41) {
174 if (buf[i] != ' ')
175 goto bad_graft_data;
176 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
177 goto bad_graft_data;
178 }
179 return graft;
df5d43be
RT
180
181bad_graft_data:
182 error("bad graft data: %s", buf);
183 free(graft);
184 return NULL;
5040f17e
JH
185}
186
c5ae6439 187static int read_graft_file(const char *graft_file)
5da5c8f4 188{
5da5c8f4
JH
189 FILE *fp = fopen(graft_file, "r");
190 char buf[1024];
5040f17e
JH
191 if (!fp)
192 return -1;
5da5c8f4
JH
193 while (fgets(buf, sizeof(buf), fp)) {
194 /* The format is just "Commit Parent1 Parent2 ...\n" */
195 int len = strlen(buf);
5040f17e 196 struct commit_graft *graft = read_graft_line(buf, len);
5bc4ce58
JH
197 if (!graft)
198 continue;
5040f17e 199 if (register_commit_graft(graft, 1))
5da5c8f4 200 error("duplicate graft data: %s", buf);
5da5c8f4
JH
201 }
202 fclose(fp);
5040f17e
JH
203 return 0;
204}
205
206static void prepare_commit_graft(void)
207{
208 static int commit_graft_prepared;
209 char *graft_file;
210
211 if (commit_graft_prepared)
212 return;
213 graft_file = get_graft_file();
214 read_graft_file(graft_file);
ed09aef0
JS
215 /* make sure shallows are read */
216 is_repository_shallow();
5040f17e 217 commit_graft_prepared = 1;
5da5c8f4
JH
218}
219
45163382 220struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
5da5c8f4
JH
221{
222 int pos;
5040f17e 223 prepare_commit_graft();
5da5c8f4
JH
224 pos = commit_graft_pos(sha1);
225 if (pos < 0)
226 return NULL;
227 return commit_graft[pos];
228}
229
09d46644 230int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
ed09aef0 231{
09d46644
NTND
232 int i, ret;
233 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
234 ret = fn(commit_graft[i], cb_data);
235 return ret;
ed09aef0
JS
236}
237
f53514bc
JS
238int unregister_shallow(const unsigned char *sha1)
239{
240 int pos = commit_graft_pos(sha1);
241 if (pos < 0)
242 return -1;
243 if (pos + 1 < commit_graft_nr)
65d41d48 244 memmove(commit_graft + pos, commit_graft + pos + 1,
f53514bc
JS
245 sizeof(struct commit_graft *)
246 * (commit_graft_nr - pos - 1));
247 commit_graft_nr--;
248 return 0;
249}
250
cf7b1cad 251int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
175785e5 252{
cf7b1cad
NTND
253 const char *tail = buffer;
254 const char *bufptr = buffer;
175785e5 255 unsigned char parent[20];
6c88be16 256 struct commit_list **pptr;
5da5c8f4 257 struct commit_graft *graft;
bd2c39f5 258
175785e5
DB
259 if (item->object.parsed)
260 return 0;
261 item->object.parsed = 1;
3b44f15a 262 tail += size;
0a617799 263 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
f7cc77d7 264 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
0a617799 265 if (get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde8
JH
266 return error("bad tree pointer in commit %s",
267 sha1_to_hex(item->object.sha1));
175785e5 268 item->tree = lookup_tree(parent);
175785e5 269 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 270 pptr = &item->parents;
5da5c8f4
JH
271
272 graft = lookup_commit_graft(item->object.sha1);
3b44f15a 273 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
f7cc77d7
LT
274 struct commit *new_parent;
275
3b44f15a
JH
276 if (tail <= bufptr + 48 ||
277 get_sha1_hex(bufptr + 7, parent) ||
278 bufptr[47] != '\n')
f7cc77d7 279 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4 280 bufptr += 48;
7f3140cd
JS
281 /*
282 * The clone is shallow if nr_parent < 0, and we must
283 * not traverse its real parents even when we unhide them.
284 */
285 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
5da5c8f4 286 continue;
f7cc77d7 287 new_parent = lookup_commit(parent);
39468def 288 if (new_parent)
6c88be16 289 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4
JH
290 }
291 if (graft) {
292 int i;
293 struct commit *new_parent;
294 for (i = 0; i < graft->nr_parent; i++) {
295 new_parent = lookup_commit(graft->parent[i]);
296 if (!new_parent)
297 continue;
298 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4 299 }
175785e5 300 }
0a617799 301 item->date = parse_commit_date(bufptr, tail);
27dedf0c 302
175785e5
DB
303 return 0;
304}
305
bd2c39f5
NP
306int parse_commit(struct commit *item)
307{
21666f1a 308 enum object_type type;
bd2c39f5
NP
309 void *buffer;
310 unsigned long size;
311 int ret;
312
9786f68b
MK
313 if (!item)
314 return -1;
bd2c39f5
NP
315 if (item->object.parsed)
316 return 0;
21666f1a 317 buffer = read_sha1_file(item->object.sha1, &type, &size);
bd2c39f5
NP
318 if (!buffer)
319 return error("Could not read %s",
320 sha1_to_hex(item->object.sha1));
21666f1a 321 if (type != OBJ_COMMIT) {
bd2c39f5
NP
322 free(buffer);
323 return error("Object %s not a commit",
324 sha1_to_hex(item->object.sha1));
325 }
326 ret = parse_commit_buffer(item, buffer, size);
60ab26de 327 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
328 item->buffer = buffer;
329 return 0;
330 }
bd2c39f5
NP
331 free(buffer);
332 return ret;
333}
334
11af2aae
CC
335int find_commit_subject(const char *commit_buffer, const char **subject)
336{
337 const char *eol;
338 const char *p = commit_buffer;
339
340 while (*p && (*p != '\n' || p[1] != '\n'))
341 p++;
342 if (*p) {
343 p += 2;
344 for (eol = p; *eol && *eol != '\n'; eol++)
345 ; /* do nothing */
346 } else
347 eol = p;
348
349 *subject = p;
350
351 return eol - p;
352}
353
ac5155ef 354struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 355{
812666c8 356 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
357 new_list->item = item;
358 new_list->next = *list_p;
359 *list_p = new_list;
ac5155ef 360 return new_list;
dd97f850
DB
361}
362
65319475
MV
363unsigned commit_list_count(const struct commit_list *l)
364{
365 unsigned c = 0;
366 for (; l; l = l->next )
367 c++;
368 return c;
369}
370
175785e5
DB
371void free_commit_list(struct commit_list *list)
372{
373 while (list) {
374 struct commit_list *temp = list;
375 list = temp->next;
376 free(temp);
377 }
378}
dd97f850 379
47e44ed1 380struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
381{
382 struct commit_list **pp = list;
383 struct commit_list *p;
384 while ((p = *pp) != NULL) {
385 if (p->item->date < item->date) {
386 break;
387 }
388 pp = &p->next;
389 }
f755494c 390 return commit_list_insert(item, pp);
dd97f850
DB
391}
392
a6080a0a 393
47e44ed1 394void commit_list_sort_by_date(struct commit_list **list)
dd97f850
DB
395{
396 struct commit_list *ret = NULL;
397 while (*list) {
47e44ed1 398 commit_list_insert_by_date((*list)->item, &ret);
dd97f850
DB
399 *list = (*list)->next;
400 }
401 *list = ret;
402}
403
58e28af6
DB
404struct commit *pop_most_recent_commit(struct commit_list **list,
405 unsigned int mark)
dd97f850
DB
406{
407 struct commit *ret = (*list)->item;
408 struct commit_list *parents = ret->parents;
409 struct commit_list *old = *list;
410
411 *list = (*list)->next;
412 free(old);
413
414 while (parents) {
4056c091 415 struct commit *commit = parents->item;
dec38c81 416 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
58e28af6 417 commit->object.flags |= mark;
47e44ed1 418 commit_list_insert_by_date(commit, list);
4056c091 419 }
dd97f850
DB
420 parents = parents->next;
421 }
422 return ret;
423}
e3bc7a3b 424
f8f9c73c
JH
425void clear_commit_marks(struct commit *commit, unsigned int mark)
426{
60fcc2e6
JS
427 while (commit) {
428 struct commit_list *parents;
f8f9c73c 429
60fcc2e6
JS
430 if (!(mark & commit->object.flags))
431 return;
58ecf5c1 432
60fcc2e6
JS
433 commit->object.flags &= ~mark;
434
435 parents = commit->parents;
436 if (!parents)
437 return;
438
439 while ((parents = parents->next))
440 clear_commit_marks(parents->item, mark);
441
442 commit = commit->parents->item;
f8f9c73c
JH
443 }
444}
445
86a0a408
RS
446void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
447{
448 struct object *object;
449 struct commit *commit;
450 unsigned int i;
451
452 for (i = 0; i < a->nr; i++) {
453 object = a->objects[i].item;
454 commit = lookup_commit_reference_gently(object->sha1, 1);
455 if (commit)
456 clear_commit_marks(commit, mark);
457 }
458}
459
a3437b8c
JS
460struct commit *pop_commit(struct commit_list **stack)
461{
462 struct commit_list *top = *stack;
463 struct commit *item = top ? top->item : NULL;
464
465 if (top) {
466 *stack = top->next;
467 free(top);
468 }
469 return item;
470}
471
ab580ace
JS
472/*
473 * Performs an in-place topological sort on the list supplied.
474 */
4c8725f1 475void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2 476{
23c17d4a
LT
477 struct commit_list *next, *orig = *list;
478 struct commit_list *work, **insert;
479 struct commit_list **pptr;
a6080a0a 480
23c17d4a 481 if (!orig)
7d6fb370 482 return;
23c17d4a
LT
483 *list = NULL;
484
485 /* Mark them and clear the indegree */
486 for (next = orig; next; next = next->next) {
487 struct commit *commit = next->item;
e358f3c3 488 commit->indegree = 1;
ab580ace 489 }
23c17d4a 490
ab580ace 491 /* update the indegree */
23c17d4a 492 for (next = orig; next; next = next->next) {
ab580ace
JS
493 struct commit_list * parents = next->item->parents;
494 while (parents) {
23c17d4a 495 struct commit *parent = parents->item;
6b6dcfc2 496
e358f3c3 497 if (parent->indegree)
23c17d4a
LT
498 parent->indegree++;
499 parents = parents->next;
ab580ace 500 }
ab580ace 501 }
23c17d4a 502
a6080a0a 503 /*
674d1727
PH
504 * find the tips
505 *
506 * tips are nodes not reachable from any other node in the list
507 *
508 * the tips serve as a starting set for the work queue.
509 */
23c17d4a 510 work = NULL;
2ed02887 511 insert = &work;
23c17d4a
LT
512 for (next = orig; next; next = next->next) {
513 struct commit *commit = next->item;
ab580ace 514
e358f3c3 515 if (commit->indegree == 1)
23c17d4a 516 insert = &commit_list_insert(commit, insert)->next;
ab580ace 517 }
4c8725f1 518
ab580ace 519 /* process the list in topological order */
4c8725f1 520 if (!lifo)
47e44ed1 521 commit_list_sort_by_date(&work);
23c17d4a
LT
522
523 pptr = list;
524 *list = NULL;
ab580ace 525 while (work) {
23c17d4a
LT
526 struct commit *commit;
527 struct commit_list *parents, *work_item;
ab580ace 528
23c17d4a
LT
529 work_item = work;
530 work = work_item->next;
531 work_item->next = NULL;
532
533 commit = work_item->item;
534 for (parents = commit->parents; parents ; parents = parents->next) {
cd2b8ae9 535 struct commit *parent = parents->item;
23c17d4a 536
e358f3c3 537 if (!parent->indegree)
23c17d4a
LT
538 continue;
539
540 /*
541 * parents are only enqueued for emission
542 * when all their children have been emitted thereby
543 * guaranteeing topological order.
544 */
e358f3c3 545 if (--parent->indegree == 1) {
23c17d4a 546 if (!lifo)
47e44ed1 547 commit_list_insert_by_date(parent, &work);
23c17d4a
LT
548 else
549 commit_list_insert(parent, &work);
ab580ace 550 }
ab580ace
JS
551 }
552 /*
674d1727
PH
553 * work_item is a commit all of whose children
554 * have already been emitted. we can emit it now.
555 */
e358f3c3 556 commit->indegree = 0;
23c17d4a
LT
557 *pptr = work_item;
558 pptr = &work_item->next;
ab580ace 559 }
ab580ace 560}
7c6f8aaf 561
1295228d 562/* merge-base stuff */
7c6f8aaf 563
577ed5c2
JH
564/* bits #0..15 in revision.h */
565#define PARENT1 (1u<<16)
566#define PARENT2 (1u<<17)
567#define STALE (1u<<18)
568#define RESULT (1u<<19)
7c6f8aaf 569
1295228d
JH
570static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
571
7c6f8aaf
JS
572static struct commit *interesting(struct commit_list *list)
573{
574 while (list) {
575 struct commit *commit = list->item;
576 list = list->next;
542ccefe 577 if (commit->object.flags & STALE)
7c6f8aaf
JS
578 continue;
579 return commit;
580 }
581 return NULL;
582}
583
6a938648 584static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
7c6f8aaf
JS
585{
586 struct commit_list *list = NULL;
587 struct commit_list *result = NULL;
6a938648 588 int i;
7c6f8aaf 589
6a938648
JH
590 for (i = 0; i < n; i++) {
591 if (one == twos[i])
592 /*
593 * We do not mark this even with RESULT so we do not
594 * have to clean it up.
595 */
596 return commit_list_insert(one, &result);
597 }
7c6f8aaf 598
172947e6
MK
599 if (parse_commit(one))
600 return NULL;
6a938648
JH
601 for (i = 0; i < n; i++) {
602 if (parse_commit(twos[i]))
603 return NULL;
604 }
7c6f8aaf 605
f3249438 606 one->object.flags |= PARENT1;
47e44ed1 607 commit_list_insert_by_date(one, &list);
6a938648
JH
608 for (i = 0; i < n; i++) {
609 twos[i]->object.flags |= PARENT2;
47e44ed1 610 commit_list_insert_by_date(twos[i], &list);
6a938648 611 }
7c6f8aaf
JS
612
613 while (interesting(list)) {
f3249438 614 struct commit *commit;
7c6f8aaf 615 struct commit_list *parents;
f203d696 616 struct commit_list *next;
f3249438 617 int flags;
7c6f8aaf 618
f3249438 619 commit = list->item;
f203d696 620 next = list->next;
f3249438 621 free(list);
f203d696 622 list = next;
7c6f8aaf 623
f3249438
JH
624 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
625 if (flags == (PARENT1 | PARENT2)) {
626 if (!(commit->object.flags & RESULT)) {
627 commit->object.flags |= RESULT;
47e44ed1 628 commit_list_insert_by_date(commit, &result);
f3249438 629 }
542ccefe
JH
630 /* Mark parents of a found merge stale */
631 flags |= STALE;
7c6f8aaf
JS
632 }
633 parents = commit->parents;
634 while (parents) {
635 struct commit *p = parents->item;
636 parents = parents->next;
637 if ((p->object.flags & flags) == flags)
638 continue;
172947e6
MK
639 if (parse_commit(p))
640 return NULL;
7c6f8aaf 641 p->object.flags |= flags;
47e44ed1 642 commit_list_insert_by_date(p, &list);
7c6f8aaf
JS
643 }
644 }
645
f3249438 646 /* Clean up the result to remove stale ones */
1295228d 647 free_commit_list(list);
f3249438
JH
648 list = result; result = NULL;
649 while (list) {
f203d696 650 struct commit_list *next = list->next;
f3249438 651 if (!(list->item->object.flags & STALE))
47e44ed1 652 commit_list_insert_by_date(list->item, &result);
f3249438 653 free(list);
f203d696 654 list = next;
f3249438
JH
655 }
656 return result;
657}
7c6f8aaf 658
5240c9d7
MV
659struct commit_list *get_octopus_merge_bases(struct commit_list *in)
660{
661 struct commit_list *i, *j, *k, *ret = NULL;
662 struct commit_list **pptr = &ret;
663
664 for (i = in; i; i = i->next) {
665 if (!ret)
666 pptr = &commit_list_insert(i->item, pptr)->next;
667 else {
668 struct commit_list *new = NULL, *end = NULL;
669
670 for (j = ret; j; j = j->next) {
671 struct commit_list *bases;
672 bases = get_merge_bases(i->item, j->item, 1);
673 if (!new)
674 new = bases;
675 else
676 end->next = bases;
677 for (k = bases; k; k = k->next)
678 end = k;
679 }
680 ret = new;
681 }
682 }
683 return ret;
684}
685
6a938648
JH
686struct commit_list *get_merge_bases_many(struct commit *one,
687 int n,
688 struct commit **twos,
689 int cleanup)
f3249438 690{
f3249438
JH
691 struct commit_list *list;
692 struct commit **rslt;
693 struct commit_list *result;
694 int cnt, i, j;
695
6a938648
JH
696 result = merge_bases_many(one, n, twos);
697 for (i = 0; i < n; i++) {
698 if (one == twos[i])
699 return result;
700 }
f3249438
JH
701 if (!result || !result->next) {
702 if (cleanup) {
703 clear_commit_marks(one, all_flags);
6a938648
JH
704 for (i = 0; i < n; i++)
705 clear_commit_marks(twos[i], all_flags);
7c6f8aaf 706 }
f3249438 707 return result;
7c6f8aaf
JS
708 }
709
f3249438
JH
710 /* There are more than one */
711 cnt = 0;
712 list = result;
713 while (list) {
714 list = list->next;
715 cnt++;
716 }
717 rslt = xcalloc(cnt, sizeof(*rslt));
718 for (list = result, i = 0; list; list = list->next)
719 rslt[i++] = list->item;
720 free_commit_list(result);
721
722 clear_commit_marks(one, all_flags);
6a938648
JH
723 for (i = 0; i < n; i++)
724 clear_commit_marks(twos[i], all_flags);
f3249438
JH
725 for (i = 0; i < cnt - 1; i++) {
726 for (j = i+1; j < cnt; j++) {
727 if (!rslt[i] || !rslt[j])
728 continue;
6a938648 729 result = merge_bases_many(rslt[i], 1, &rslt[j]);
f3249438
JH
730 clear_commit_marks(rslt[i], all_flags);
731 clear_commit_marks(rslt[j], all_flags);
732 for (list = result; list; list = list->next) {
733 if (rslt[i] == list->item)
734 rslt[i] = NULL;
735 if (rslt[j] == list->item)
736 rslt[j] = NULL;
737 }
738 }
58ecf5c1 739 }
7c6f8aaf 740
f3249438
JH
741 /* Surviving ones in rslt[] are the independent results */
742 result = NULL;
743 for (i = 0; i < cnt; i++) {
744 if (rslt[i])
47e44ed1 745 commit_list_insert_by_date(rslt[i], &result);
f3249438
JH
746 }
747 free(rslt);
7c6f8aaf
JS
748 return result;
749}
2ecd2bbc 750
6a938648
JH
751struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
752 int cleanup)
753{
754 return get_merge_bases_many(one, 1, &two, cleanup);
755}
756
7fcdb36e
JG
757int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
758{
759 if (!with_commit)
760 return 1;
761 while (with_commit) {
762 struct commit *other;
763
764 other = with_commit->item;
765 with_commit = with_commit->next;
766 if (in_merge_bases(other, &commit, 1))
767 return 1;
768 }
769 return 0;
770}
771
03840fc3 772int in_merge_bases(struct commit *commit, struct commit **reference, int num)
2ecd2bbc
JH
773{
774 struct commit_list *bases, *b;
775 int ret = 0;
776
03840fc3
JH
777 if (num == 1)
778 bases = get_merge_bases(commit, *reference, 1);
779 else
780 die("not yet");
2ecd2bbc 781 for (b = bases; b; b = b->next) {
03840fc3 782 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
2ecd2bbc
JH
783 ret = 1;
784 break;
785 }
786 }
787
788 free_commit_list(bases);
789 return ret;
790}
98cf9c3b
JH
791
792struct commit_list *reduce_heads(struct commit_list *heads)
793{
794 struct commit_list *p;
795 struct commit_list *result = NULL, **tail = &result;
796 struct commit **other;
797 size_t num_head, num_other;
798
799 if (!heads)
800 return NULL;
801
802 /* Avoid unnecessary reallocations */
803 for (p = heads, num_head = 0; p; p = p->next)
804 num_head++;
805 other = xcalloc(sizeof(*other), num_head);
806
807 /* For each commit, see if it can be reached by others */
808 for (p = heads; p; p = p->next) {
809 struct commit_list *q, *base;
810
711f6b29
JH
811 /* Do we already have this in the result? */
812 for (q = result; q; q = q->next)
813 if (p->item == q->item)
814 break;
815 if (q)
816 continue;
817
98cf9c3b
JH
818 num_other = 0;
819 for (q = heads; q; q = q->next) {
3d1dd472 820 if (p->item == q->item)
98cf9c3b
JH
821 continue;
822 other[num_other++] = q->item;
823 }
711f6b29 824 if (num_other)
98cf9c3b 825 base = get_merge_bases_many(p->item, num_other, other, 1);
711f6b29 826 else
98cf9c3b
JH
827 base = NULL;
828 /*
829 * If p->item does not have anything common with other
830 * commits, there won't be any merge base. If it is
831 * reachable from some of the others, p->item will be
832 * the merge base. If its history is connected with
833 * others, but p->item is not reachable by others, we
834 * will get something other than p->item back.
835 */
836 if (!base || (base->item != p->item))
837 tail = &(commit_list_insert(p->item, tail)->next);
838 free_commit_list(base);
839 }
840 free(other);
841 return result;
842}
40d52ff7 843
ba3c69a9
JH
844static const char gpg_sig_header[] = "gpgsig";
845static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
846
847static int do_sign_commit(struct strbuf *buf, const char *keyid)
848{
849 struct strbuf sig = STRBUF_INIT;
850 int inspos, copypos;
851
852 /* find the end of the header */
853 inspos = strstr(buf->buf, "\n\n") - buf->buf + 1;
854
855 if (!keyid || !*keyid)
856 keyid = get_signing_key();
857 if (sign_buffer(buf, &sig, keyid)) {
858 strbuf_release(&sig);
859 return -1;
860 }
861
862 for (copypos = 0; sig.buf[copypos]; ) {
863 const char *bol = sig.buf + copypos;
864 const char *eol = strchrnul(bol, '\n');
865 int len = (eol - bol) + !!*eol;
866
867 if (!copypos) {
868 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
869 inspos += gpg_sig_header_len;
870 }
871 strbuf_insert(buf, inspos++, " ", 1);
872 strbuf_insert(buf, inspos, bol, len);
873 inspos += len;
874 copypos += len;
875 }
876 strbuf_release(&sig);
877 return 0;
878}
879
5231c633
JH
880static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
881{
882 struct merge_remote_desc *desc;
883 struct commit_extra_header *mergetag;
884 char *buf;
885 unsigned long size, len;
886 enum object_type type;
887
888 desc = merge_remote_util(parent);
889 if (!desc || !desc->obj)
890 return;
891 buf = read_sha1_file(desc->obj->sha1, &type, &size);
892 if (!buf || type != OBJ_TAG)
893 goto free_return;
894 len = parse_signature(buf, size);
895 if (size == len)
896 goto free_return;
897 /*
898 * We could verify this signature and either omit the tag when
899 * it does not validate, but the integrator may not have the
900 * public key of the signer of the tag he is merging, while a
901 * later auditor may have it while auditing, so let's not run
902 * verify-signed-buffer here for now...
903 *
904 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
905 * warn("warning: signed tag unverified.");
906 */
907 mergetag = xcalloc(1, sizeof(*mergetag));
908 mergetag->key = xstrdup("mergetag");
909 mergetag->value = buf;
910 mergetag->len = size;
911
912 **tail = mergetag;
913 *tail = &mergetag->next;
914 return;
915
916free_return:
917 free(buf);
918}
919
920void append_merge_tag_headers(struct commit_list *parents,
921 struct commit_extra_header ***tail)
922{
923 while (parents) {
924 struct commit *parent = parents->item;
925 handle_signed_tag(parent, tail);
926 parents = parents->next;
927 }
928}
929
930static void add_extra_header(struct strbuf *buffer,
931 struct commit_extra_header *extra)
932{
933 strbuf_addstr(buffer, extra->key);
ed7a42a0
JH
934 if (extra->len)
935 strbuf_add_lines(buffer, " ", extra->value, extra->len);
936 else
937 strbuf_addch(buffer, '\n');
938}
939
940struct commit_extra_header *read_commit_extra_headers(struct commit *commit)
941{
942 struct commit_extra_header *extra = NULL;
943 unsigned long size;
944 enum object_type type;
945 char *buffer = read_sha1_file(commit->object.sha1, &type, &size);
946 if (buffer && type == OBJ_COMMIT)
947 extra = read_commit_extra_header_lines(buffer, size);
948 free(buffer);
949 return extra;
950}
951
952static inline int standard_header_field(const char *field, size_t len)
953{
954 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
955 (len == 6 && !memcmp(field, "parent ", 7)) ||
956 (len == 6 && !memcmp(field, "author ", 7)) ||
957 (len == 9 && !memcmp(field, "committer ", 10)) ||
958 (len == 8 && !memcmp(field, "encoding ", 9)));
959}
960
961struct commit_extra_header *read_commit_extra_header_lines(const char *buffer, size_t size)
962{
963 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
964 const char *line, *next, *eof, *eob;
965 struct strbuf buf = STRBUF_INIT;
966
967 for (line = buffer, eob = line + size;
968 line < eob && *line != '\n';
969 line = next) {
970 next = memchr(line, '\n', eob - line);
971 next = next ? next + 1 : eob;
972 if (*line == ' ') {
973 /* continuation */
974 if (it)
975 strbuf_add(&buf, line + 1, next - (line + 1));
976 continue;
977 }
978 if (it)
979 it->value = strbuf_detach(&buf, &it->len);
980 strbuf_reset(&buf);
981 it = NULL;
982
983 eof = strchr(line, ' ');
984 if (next <= eof)
985 eof = next;
986
987 if (standard_header_field(line, eof - line))
988 continue;
989
990 it = xcalloc(1, sizeof(*it));
991 it->key = xmemdupz(line, eof-line);
992 *tail = it;
993 tail = &it->next;
994 if (eof + 1 < next)
995 strbuf_add(&buf, eof + 1, next - (eof + 1));
996 }
997 if (it)
998 it->value = strbuf_detach(&buf, &it->len);
999 return extra;
5231c633
JH
1000}
1001
1002void free_commit_extra_headers(struct commit_extra_header *extra)
1003{
1004 while (extra) {
1005 struct commit_extra_header *next = extra->next;
1006 free(extra->key);
1007 free(extra->value);
1008 free(extra);
1009 extra = next;
1010 }
1011}
1012
1013int commit_tree(const char *msg, unsigned char *tree,
1014 struct commit_list *parents, unsigned char *ret,
ba3c69a9 1015 const char *author, const char *sign_commit)
5231c633
JH
1016{
1017 struct commit_extra_header *extra = NULL, **tail = &extra;
1018 int result;
1019
1020 append_merge_tag_headers(parents, &tail);
ba3c69a9
JH
1021 result = commit_tree_extended(msg, tree, parents, ret,
1022 author, sign_commit, extra);
5231c633
JH
1023 free_commit_extra_headers(extra);
1024 return result;
1025}
1026
40d52ff7
JK
1027static const char commit_utf8_warn[] =
1028"Warning: commit message does not conform to UTF-8.\n"
1029"You may want to amend it after fixing the message, or set the config\n"
1030"variable i18n.commitencoding to the encoding your project uses.\n";
1031
5231c633
JH
1032int commit_tree_extended(const char *msg, unsigned char *tree,
1033 struct commit_list *parents, unsigned char *ret,
ba3c69a9
JH
1034 const char *author, const char *sign_commit,
1035 struct commit_extra_header *extra)
40d52ff7
JK
1036{
1037 int result;
1038 int encoding_is_utf8;
1039 struct strbuf buffer;
1040
1041 assert_sha1_type(tree, OBJ_TREE);
1042
1043 /* Not having i18n.commitencoding is the same as having utf-8 */
1044 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1045
1046 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1047 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1048
1049 /*
1050 * NOTE! This ordering means that the same exact tree merged with a
1051 * different order of parents will be a _different_ changeset even
1052 * if everything else stays the same.
1053 */
1054 while (parents) {
1055 struct commit_list *next = parents->next;
5231c633
JH
1056 struct commit *parent = parents->item;
1057
40d52ff7 1058 strbuf_addf(&buffer, "parent %s\n",
5231c633 1059 sha1_to_hex(parent->object.sha1));
40d52ff7
JK
1060 free(parents);
1061 parents = next;
1062 }
1063
1064 /* Person/date information */
1065 if (!author)
1066 author = git_author_info(IDENT_ERROR_ON_NO_NAME);
1067 strbuf_addf(&buffer, "author %s\n", author);
1068 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME));
1069 if (!encoding_is_utf8)
1070 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
5231c633
JH
1071
1072 while (extra) {
1073 add_extra_header(&buffer, extra);
1074 extra = extra->next;
1075 }
40d52ff7
JK
1076 strbuf_addch(&buffer, '\n');
1077
1078 /* And add the comment */
1079 strbuf_addstr(&buffer, msg);
1080
1081 /* And check the encoding */
1082 if (encoding_is_utf8 && !is_utf8(buffer.buf))
1083 fprintf(stderr, commit_utf8_warn);
1084
ba3c69a9
JH
1085 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1086 return -1;
1087
40d52ff7
JK
1088 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1089 strbuf_release(&buffer);
1090 return result;
1091}
ae8e4c9c
JH
1092
1093struct commit *get_merge_parent(const char *name)
1094{
1095 struct object *obj;
1096 struct commit *commit;
1097 unsigned char sha1[20];
1098 if (get_sha1(name, sha1))
1099 return NULL;
1100 obj = parse_object(sha1);
1101 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1102 if (commit && !commit->util) {
1103 struct merge_remote_desc *desc;
1104 desc = xmalloc(sizeof(*desc));
1105 desc->obj = obj;
1106 desc->name = strdup(name);
1107 commit->util = desc;
1108 }
1109 return commit;
1110}