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