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