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