fetch-pack: add tracing for negotiation rounds
[git.git] / commit.c
blob0db461f97355d4ae02a2106da0219012ff16efe9
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "commit-graph.h"
5 #include "repository.h"
6 #include "object-store.h"
7 #include "pkt-line.h"
8 #include "utf8.h"
9 #include "diff.h"
10 #include "revision.h"
11 #include "notes.h"
12 #include "alloc.h"
13 #include "gpg-interface.h"
14 #include "mergesort.h"
15 #include "commit-slab.h"
16 #include "prio-queue.h"
17 #include "hash-lookup.h"
18 #include "wt-status.h"
19 #include "advice.h"
20 #include "refs.h"
21 #include "commit-reach.h"
22 #include "run-command.h"
23 #include "shallow.h"
24 #include "hook.h"
26 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
28 int save_commit_buffer = 1;
29 int no_graft_file_deprecated_advice;
31 const char *commit_type = "commit";
33 struct commit *lookup_commit_reference_gently(struct repository *r,
34 const struct object_id *oid, int quiet)
36 struct object *obj = deref_tag(r,
37 parse_object(r, oid),
38 NULL, 0);
40 if (!obj)
41 return NULL;
42 return object_as_type(obj, OBJ_COMMIT, quiet);
45 struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid)
47 return lookup_commit_reference_gently(r, oid, 0);
50 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
52 struct commit *c = lookup_commit_reference(the_repository, oid);
53 if (!c)
54 die(_("could not parse %s"), ref_name);
55 if (!oideq(oid, &c->object.oid)) {
56 warning(_("%s %s is not a commit!"),
57 ref_name, oid_to_hex(oid));
59 return c;
62 struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
64 struct object *obj = lookup_object(r, oid);
65 if (!obj)
66 return create_object(r, oid, alloc_commit_node(r));
67 return object_as_type(obj, OBJ_COMMIT, 0);
70 struct commit *lookup_commit_reference_by_name(const char *name)
72 struct object_id oid;
73 struct commit *commit;
75 if (get_oid_committish(name, &oid))
76 return NULL;
77 commit = lookup_commit_reference(the_repository, &oid);
78 if (parse_commit(commit))
79 return NULL;
80 return commit;
83 static timestamp_t parse_commit_date(const char *buf, const char *tail)
85 const char *dateptr;
87 if (buf + 6 >= tail)
88 return 0;
89 if (memcmp(buf, "author", 6))
90 return 0;
91 while (buf < tail && *buf++ != '\n')
92 /* nada */;
93 if (buf + 9 >= tail)
94 return 0;
95 if (memcmp(buf, "committer", 9))
96 return 0;
97 while (buf < tail && *buf++ != '>')
98 /* nada */;
99 if (buf >= tail)
100 return 0;
101 dateptr = buf;
102 while (buf < tail && *buf++ != '\n')
103 /* nada */;
104 if (buf >= tail)
105 return 0;
106 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
107 return parse_timestamp(dateptr, NULL, 10);
110 static const struct object_id *commit_graft_oid_access(size_t index, const void *table)
112 const struct commit_graft * const *commit_graft_table = table;
113 return &commit_graft_table[index]->oid;
116 int commit_graft_pos(struct repository *r, const struct object_id *oid)
118 return oid_pos(oid, r->parsed_objects->grafts,
119 r->parsed_objects->grafts_nr,
120 commit_graft_oid_access);
123 static void unparse_commit(struct repository *r, const struct object_id *oid)
125 struct commit *c = lookup_commit(r, oid);
127 if (!c->object.parsed)
128 return;
129 free_commit_list(c->parents);
130 c->parents = NULL;
131 c->object.parsed = 0;
134 int register_commit_graft(struct repository *r, struct commit_graft *graft,
135 int ignore_dups)
137 int pos = commit_graft_pos(r, &graft->oid);
139 if (0 <= pos) {
140 if (ignore_dups)
141 free(graft);
142 else {
143 free(r->parsed_objects->grafts[pos]);
144 r->parsed_objects->grafts[pos] = graft;
146 return 1;
148 pos = -pos - 1;
149 ALLOC_GROW(r->parsed_objects->grafts,
150 r->parsed_objects->grafts_nr + 1,
151 r->parsed_objects->grafts_alloc);
152 r->parsed_objects->grafts_nr++;
153 if (pos < r->parsed_objects->grafts_nr)
154 memmove(r->parsed_objects->grafts + pos + 1,
155 r->parsed_objects->grafts + pos,
156 (r->parsed_objects->grafts_nr - pos - 1) *
157 sizeof(*r->parsed_objects->grafts));
158 r->parsed_objects->grafts[pos] = graft;
159 unparse_commit(r, &graft->oid);
160 return 0;
163 struct commit_graft *read_graft_line(struct strbuf *line)
165 /* The format is just "Commit Parent1 Parent2 ...\n" */
166 int i, phase;
167 const char *tail = NULL;
168 struct commit_graft *graft = NULL;
169 struct object_id dummy_oid, *oid;
171 strbuf_rtrim(line);
172 if (!line->len || line->buf[0] == '#')
173 return NULL;
175 * phase 0 verifies line, counts hashes in line and allocates graft
176 * phase 1 fills graft
178 for (phase = 0; phase < 2; phase++) {
179 oid = graft ? &graft->oid : &dummy_oid;
180 if (parse_oid_hex(line->buf, oid, &tail))
181 goto bad_graft_data;
182 for (i = 0; *tail != '\0'; i++) {
183 oid = graft ? &graft->parent[i] : &dummy_oid;
184 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
185 goto bad_graft_data;
187 if (!graft) {
188 graft = xmalloc(st_add(sizeof(*graft),
189 st_mult(sizeof(struct object_id), i)));
190 graft->nr_parent = i;
193 return graft;
195 bad_graft_data:
196 error("bad graft data: %s", line->buf);
197 assert(!graft);
198 return NULL;
201 static int read_graft_file(struct repository *r, const char *graft_file)
203 FILE *fp = fopen_or_warn(graft_file, "r");
204 struct strbuf buf = STRBUF_INIT;
205 if (!fp)
206 return -1;
207 if (!no_graft_file_deprecated_advice &&
208 advice_enabled(ADVICE_GRAFT_FILE_DEPRECATED))
209 advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
210 "and will be removed in a future Git version.\n"
211 "\n"
212 "Please use \"git replace --convert-graft-file\"\n"
213 "to convert the grafts into replace refs.\n"
214 "\n"
215 "Turn this message off by running\n"
216 "\"git config advice.graftFileDeprecated false\""));
217 while (!strbuf_getwholeline(&buf, fp, '\n')) {
218 /* The format is just "Commit Parent1 Parent2 ...\n" */
219 struct commit_graft *graft = read_graft_line(&buf);
220 if (!graft)
221 continue;
222 if (register_commit_graft(r, graft, 1))
223 error("duplicate graft data: %s", buf.buf);
225 fclose(fp);
226 strbuf_release(&buf);
227 return 0;
230 void prepare_commit_graft(struct repository *r)
232 char *graft_file;
234 if (r->parsed_objects->commit_graft_prepared)
235 return;
236 if (!startup_info->have_repository)
237 return;
239 graft_file = get_graft_file(r);
240 read_graft_file(r, graft_file);
241 /* make sure shallows are read */
242 is_repository_shallow(r);
243 r->parsed_objects->commit_graft_prepared = 1;
246 struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid)
248 int pos;
249 prepare_commit_graft(r);
250 pos = commit_graft_pos(r, oid);
251 if (pos < 0)
252 return NULL;
253 return r->parsed_objects->grafts[pos];
256 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
258 int i, ret;
259 for (i = ret = 0; i < the_repository->parsed_objects->grafts_nr && !ret; i++)
260 ret = fn(the_repository->parsed_objects->grafts[i], cb_data);
261 return ret;
264 void reset_commit_grafts(struct repository *r)
266 int i;
268 for (i = 0; i < r->parsed_objects->grafts_nr; i++) {
269 unparse_commit(r, &r->parsed_objects->grafts[i]->oid);
270 free(r->parsed_objects->grafts[i]);
272 r->parsed_objects->grafts_nr = 0;
273 r->parsed_objects->commit_graft_prepared = 0;
276 struct commit_buffer {
277 void *buffer;
278 unsigned long size;
280 define_commit_slab(buffer_slab, struct commit_buffer);
282 struct buffer_slab *allocate_commit_buffer_slab(void)
284 struct buffer_slab *bs = xmalloc(sizeof(*bs));
285 init_buffer_slab(bs);
286 return bs;
289 void free_commit_buffer_slab(struct buffer_slab *bs)
291 clear_buffer_slab(bs);
292 free(bs);
295 void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer, unsigned long size)
297 struct commit_buffer *v = buffer_slab_at(
298 r->parsed_objects->buffer_slab, commit);
299 v->buffer = buffer;
300 v->size = size;
303 const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep)
305 struct commit_buffer *v = buffer_slab_peek(
306 r->parsed_objects->buffer_slab, commit);
307 if (!v) {
308 if (sizep)
309 *sizep = 0;
310 return NULL;
312 if (sizep)
313 *sizep = v->size;
314 return v->buffer;
317 const void *repo_get_commit_buffer(struct repository *r,
318 const struct commit *commit,
319 unsigned long *sizep)
321 const void *ret = get_cached_commit_buffer(r, commit, sizep);
322 if (!ret) {
323 enum object_type type;
324 unsigned long size;
325 ret = repo_read_object_file(r, &commit->object.oid, &type, &size);
326 if (!ret)
327 die("cannot read commit object %s",
328 oid_to_hex(&commit->object.oid));
329 if (type != OBJ_COMMIT)
330 die("expected commit for %s, got %s",
331 oid_to_hex(&commit->object.oid), type_name(type));
332 if (sizep)
333 *sizep = size;
335 return ret;
338 void repo_unuse_commit_buffer(struct repository *r,
339 const struct commit *commit,
340 const void *buffer)
342 struct commit_buffer *v = buffer_slab_peek(
343 r->parsed_objects->buffer_slab, commit);
344 if (!(v && v->buffer == buffer))
345 free((void *)buffer);
348 void free_commit_buffer(struct parsed_object_pool *pool, struct commit *commit)
350 struct commit_buffer *v = buffer_slab_peek(
351 pool->buffer_slab, commit);
352 if (v) {
353 FREE_AND_NULL(v->buffer);
354 v->size = 0;
358 static inline void set_commit_tree(struct commit *c, struct tree *t)
360 c->maybe_tree = t;
363 struct tree *repo_get_commit_tree(struct repository *r,
364 const struct commit *commit)
366 if (commit->maybe_tree || !commit->object.parsed)
367 return commit->maybe_tree;
369 if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
370 return get_commit_tree_in_graph(r, commit);
372 return NULL;
375 struct object_id *get_commit_tree_oid(const struct commit *commit)
377 struct tree *tree = get_commit_tree(commit);
378 return tree ? &tree->object.oid : NULL;
381 void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
383 set_commit_tree(c, NULL);
384 free_commit_buffer(pool, c);
385 c->index = 0;
386 free_commit_list(c->parents);
388 c->object.parsed = 0;
391 const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
393 struct commit_buffer *v = buffer_slab_peek(
394 the_repository->parsed_objects->buffer_slab, commit);
395 void *ret;
397 if (!v) {
398 if (sizep)
399 *sizep = 0;
400 return NULL;
402 ret = v->buffer;
403 if (sizep)
404 *sizep = v->size;
406 v->buffer = NULL;
407 v->size = 0;
408 return ret;
411 int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph)
413 const char *tail = buffer;
414 const char *bufptr = buffer;
415 struct object_id parent;
416 struct commit_list **pptr;
417 struct commit_graft *graft;
418 const int tree_entry_len = the_hash_algo->hexsz + 5;
419 const int parent_entry_len = the_hash_algo->hexsz + 7;
420 struct tree *tree;
422 if (item->object.parsed)
423 return 0;
425 * Presumably this is leftover from an earlier failed parse;
426 * clear it out in preparation for us re-parsing (we'll hit the
427 * same error, but that's good, since it lets our caller know
428 * the result cannot be trusted.
430 free_commit_list(item->parents);
431 item->parents = NULL;
433 tail += size;
434 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
435 bufptr[tree_entry_len] != '\n')
436 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
437 if (get_oid_hex(bufptr + 5, &parent) < 0)
438 return error("bad tree pointer in commit %s",
439 oid_to_hex(&item->object.oid));
440 tree = lookup_tree(r, &parent);
441 if (!tree)
442 return error("bad tree pointer %s in commit %s",
443 oid_to_hex(&parent),
444 oid_to_hex(&item->object.oid));
445 set_commit_tree(item, tree);
446 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
447 pptr = &item->parents;
449 graft = lookup_commit_graft(r, &item->object.oid);
450 if (graft)
451 r->parsed_objects->substituted_parent = 1;
452 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
453 struct commit *new_parent;
455 if (tail <= bufptr + parent_entry_len + 1 ||
456 get_oid_hex(bufptr + 7, &parent) ||
457 bufptr[parent_entry_len] != '\n')
458 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
459 bufptr += parent_entry_len + 1;
461 * The clone is shallow if nr_parent < 0, and we must
462 * not traverse its real parents even when we unhide them.
464 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
465 continue;
466 new_parent = lookup_commit(r, &parent);
467 if (!new_parent)
468 return error("bad parent %s in commit %s",
469 oid_to_hex(&parent),
470 oid_to_hex(&item->object.oid));
471 pptr = &commit_list_insert(new_parent, pptr)->next;
473 if (graft) {
474 int i;
475 struct commit *new_parent;
476 for (i = 0; i < graft->nr_parent; i++) {
477 new_parent = lookup_commit(r,
478 &graft->parent[i]);
479 if (!new_parent)
480 return error("bad graft parent %s in commit %s",
481 oid_to_hex(&graft->parent[i]),
482 oid_to_hex(&item->object.oid));
483 pptr = &commit_list_insert(new_parent, pptr)->next;
486 item->date = parse_commit_date(bufptr, tail);
488 if (check_graph)
489 load_commit_graph_info(r, item);
491 item->object.parsed = 1;
492 return 0;
495 int repo_parse_commit_internal(struct repository *r,
496 struct commit *item,
497 int quiet_on_missing,
498 int use_commit_graph)
500 enum object_type type;
501 void *buffer;
502 unsigned long size;
503 int ret;
505 if (!item)
506 return -1;
507 if (item->object.parsed)
508 return 0;
509 if (use_commit_graph && parse_commit_in_graph(r, item))
510 return 0;
511 buffer = repo_read_object_file(r, &item->object.oid, &type, &size);
512 if (!buffer)
513 return quiet_on_missing ? -1 :
514 error("Could not read %s",
515 oid_to_hex(&item->object.oid));
516 if (type != OBJ_COMMIT) {
517 free(buffer);
518 return error("Object %s not a commit",
519 oid_to_hex(&item->object.oid));
522 ret = parse_commit_buffer(r, item, buffer, size, 0);
523 if (save_commit_buffer && !ret) {
524 set_commit_buffer(r, item, buffer, size);
525 return 0;
527 free(buffer);
528 return ret;
531 int repo_parse_commit_gently(struct repository *r,
532 struct commit *item, int quiet_on_missing)
534 return repo_parse_commit_internal(r, item, quiet_on_missing, 1);
537 void parse_commit_or_die(struct commit *item)
539 if (parse_commit(item))
540 die("unable to parse commit %s",
541 item ? oid_to_hex(&item->object.oid) : "(null)");
544 int find_commit_subject(const char *commit_buffer, const char **subject)
546 const char *eol;
547 const char *p = commit_buffer;
549 while (*p && (*p != '\n' || p[1] != '\n'))
550 p++;
551 if (*p) {
552 p = skip_blank_lines(p + 2);
553 eol = strchrnul(p, '\n');
554 } else
555 eol = p;
557 *subject = p;
559 return eol - p;
562 size_t commit_subject_length(const char *body)
564 const char *p = body;
565 while (*p) {
566 const char *next = skip_blank_lines(p);
567 if (next != p)
568 break;
569 p = strchrnul(p, '\n');
570 if (*p)
571 p++;
573 return p - body;
576 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
578 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
579 new_list->item = item;
580 new_list->next = *list_p;
581 *list_p = new_list;
582 return new_list;
585 int commit_list_contains(struct commit *item, struct commit_list *list)
587 while (list) {
588 if (list->item == item)
589 return 1;
590 list = list->next;
593 return 0;
596 unsigned commit_list_count(const struct commit_list *l)
598 unsigned c = 0;
599 for (; l; l = l->next )
600 c++;
601 return c;
604 struct commit_list *copy_commit_list(struct commit_list *list)
606 struct commit_list *head = NULL;
607 struct commit_list **pp = &head;
608 while (list) {
609 pp = commit_list_append(list->item, pp);
610 list = list->next;
612 return head;
615 struct commit_list *reverse_commit_list(struct commit_list *list)
617 struct commit_list *next = NULL, *current, *backup;
618 for (current = list; current; current = backup) {
619 backup = current->next;
620 current->next = next;
621 next = current;
623 return next;
626 void free_commit_list(struct commit_list *list)
628 while (list)
629 pop_commit(&list);
632 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
634 struct commit_list **pp = list;
635 struct commit_list *p;
636 while ((p = *pp) != NULL) {
637 if (p->item->date < item->date) {
638 break;
640 pp = &p->next;
642 return commit_list_insert(item, pp);
645 static int commit_list_compare_by_date(const struct commit_list *a,
646 const struct commit_list *b)
648 timestamp_t a_date = a->item->date;
649 timestamp_t b_date = b->item->date;
650 if (a_date < b_date)
651 return 1;
652 if (a_date > b_date)
653 return -1;
654 return 0;
657 DEFINE_LIST_SORT(static, commit_list_sort, struct commit_list, next);
659 void commit_list_sort_by_date(struct commit_list **list)
661 commit_list_sort(list, commit_list_compare_by_date);
664 struct commit *pop_most_recent_commit(struct commit_list **list,
665 unsigned int mark)
667 struct commit *ret = pop_commit(list);
668 struct commit_list *parents = ret->parents;
670 while (parents) {
671 struct commit *commit = parents->item;
672 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
673 commit->object.flags |= mark;
674 commit_list_insert_by_date(commit, list);
676 parents = parents->next;
678 return ret;
681 static void clear_commit_marks_1(struct commit_list **plist,
682 struct commit *commit, unsigned int mark)
684 while (commit) {
685 struct commit_list *parents;
687 if (!(mark & commit->object.flags))
688 return;
690 commit->object.flags &= ~mark;
692 parents = commit->parents;
693 if (!parents)
694 return;
696 while ((parents = parents->next))
697 commit_list_insert(parents->item, plist);
699 commit = commit->parents->item;
703 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
705 struct commit_list *list = NULL;
707 while (nr--) {
708 clear_commit_marks_1(&list, *commit, mark);
709 commit++;
711 while (list)
712 clear_commit_marks_1(&list, pop_commit(&list), mark);
715 void clear_commit_marks(struct commit *commit, unsigned int mark)
717 clear_commit_marks_many(1, &commit, mark);
720 struct commit *pop_commit(struct commit_list **stack)
722 struct commit_list *top = *stack;
723 struct commit *item = top ? top->item : NULL;
725 if (top) {
726 *stack = top->next;
727 free(top);
729 return item;
733 * Topological sort support
736 /* count number of children that have not been emitted */
737 define_commit_slab(indegree_slab, int);
739 define_commit_slab(author_date_slab, timestamp_t);
741 void record_author_date(struct author_date_slab *author_date,
742 struct commit *commit)
744 const char *buffer = get_commit_buffer(commit, NULL);
745 struct ident_split ident;
746 const char *ident_line;
747 size_t ident_len;
748 char *date_end;
749 timestamp_t date;
751 ident_line = find_commit_header(buffer, "author", &ident_len);
752 if (!ident_line)
753 goto fail_exit; /* no author line */
754 if (split_ident_line(&ident, ident_line, ident_len) ||
755 !ident.date_begin || !ident.date_end)
756 goto fail_exit; /* malformed "author" line */
758 date = parse_timestamp(ident.date_begin, &date_end, 10);
759 if (date_end != ident.date_end)
760 goto fail_exit; /* malformed date */
761 *(author_date_slab_at(author_date, commit)) = date;
763 fail_exit:
764 unuse_commit_buffer(commit, buffer);
767 int compare_commits_by_author_date(const void *a_, const void *b_,
768 void *cb_data)
770 const struct commit *a = a_, *b = b_;
771 struct author_date_slab *author_date = cb_data;
772 timestamp_t a_date = *(author_date_slab_at(author_date, a));
773 timestamp_t b_date = *(author_date_slab_at(author_date, b));
775 /* newer commits with larger date first */
776 if (a_date < b_date)
777 return 1;
778 else if (a_date > b_date)
779 return -1;
780 return 0;
783 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
785 const struct commit *a = a_, *b = b_;
786 const timestamp_t generation_a = commit_graph_generation(a),
787 generation_b = commit_graph_generation(b);
789 /* newer commits first */
790 if (generation_a < generation_b)
791 return 1;
792 else if (generation_a > generation_b)
793 return -1;
795 /* use date as a heuristic when generations are equal */
796 if (a->date < b->date)
797 return 1;
798 else if (a->date > b->date)
799 return -1;
800 return 0;
803 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
805 const struct commit *a = a_, *b = b_;
806 /* newer commits with larger date first */
807 if (a->date < b->date)
808 return 1;
809 else if (a->date > b->date)
810 return -1;
811 return 0;
815 * Performs an in-place topological sort on the list supplied.
817 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
819 struct commit_list *next, *orig = *list;
820 struct commit_list **pptr;
821 struct indegree_slab indegree;
822 struct prio_queue queue;
823 struct commit *commit;
824 struct author_date_slab author_date;
826 if (!orig)
827 return;
828 *list = NULL;
830 init_indegree_slab(&indegree);
831 memset(&queue, '\0', sizeof(queue));
833 switch (sort_order) {
834 default: /* REV_SORT_IN_GRAPH_ORDER */
835 queue.compare = NULL;
836 break;
837 case REV_SORT_BY_COMMIT_DATE:
838 queue.compare = compare_commits_by_commit_date;
839 break;
840 case REV_SORT_BY_AUTHOR_DATE:
841 init_author_date_slab(&author_date);
842 queue.compare = compare_commits_by_author_date;
843 queue.cb_data = &author_date;
844 break;
847 /* Mark them and clear the indegree */
848 for (next = orig; next; next = next->next) {
849 struct commit *commit = next->item;
850 *(indegree_slab_at(&indegree, commit)) = 1;
851 /* also record the author dates, if needed */
852 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
853 record_author_date(&author_date, commit);
856 /* update the indegree */
857 for (next = orig; next; next = next->next) {
858 struct commit_list *parents = next->item->parents;
859 while (parents) {
860 struct commit *parent = parents->item;
861 int *pi = indegree_slab_at(&indegree, parent);
863 if (*pi)
864 (*pi)++;
865 parents = parents->next;
870 * find the tips
872 * tips are nodes not reachable from any other node in the list
874 * the tips serve as a starting set for the work queue.
876 for (next = orig; next; next = next->next) {
877 struct commit *commit = next->item;
879 if (*(indegree_slab_at(&indegree, commit)) == 1)
880 prio_queue_put(&queue, commit);
884 * This is unfortunate; the initial tips need to be shown
885 * in the order given from the revision traversal machinery.
887 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
888 prio_queue_reverse(&queue);
890 /* We no longer need the commit list */
891 free_commit_list(orig);
893 pptr = list;
894 *list = NULL;
895 while ((commit = prio_queue_get(&queue)) != NULL) {
896 struct commit_list *parents;
898 for (parents = commit->parents; parents ; parents = parents->next) {
899 struct commit *parent = parents->item;
900 int *pi = indegree_slab_at(&indegree, parent);
902 if (!*pi)
903 continue;
906 * parents are only enqueued for emission
907 * when all their children have been emitted thereby
908 * guaranteeing topological order.
910 if (--(*pi) == 1)
911 prio_queue_put(&queue, parent);
914 * all children of commit have already been
915 * emitted. we can emit it now.
917 *(indegree_slab_at(&indegree, commit)) = 0;
919 pptr = &commit_list_insert(commit, pptr)->next;
922 clear_indegree_slab(&indegree);
923 clear_prio_queue(&queue);
924 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
925 clear_author_date_slab(&author_date);
928 struct rev_collect {
929 struct commit **commit;
930 int nr;
931 int alloc;
932 unsigned int initial : 1;
935 static void add_one_commit(struct object_id *oid, struct rev_collect *revs)
937 struct commit *commit;
939 if (is_null_oid(oid))
940 return;
942 commit = lookup_commit(the_repository, oid);
943 if (!commit ||
944 (commit->object.flags & TMP_MARK) ||
945 parse_commit(commit))
946 return;
948 ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc);
949 revs->commit[revs->nr++] = commit;
950 commit->object.flags |= TMP_MARK;
953 static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
954 const char *ident, timestamp_t timestamp,
955 int tz, const char *message, void *cbdata)
957 struct rev_collect *revs = cbdata;
959 if (revs->initial) {
960 revs->initial = 0;
961 add_one_commit(ooid, revs);
963 add_one_commit(noid, revs);
964 return 0;
967 struct commit *get_fork_point(const char *refname, struct commit *commit)
969 struct object_id oid;
970 struct rev_collect revs;
971 struct commit_list *bases;
972 int i;
973 struct commit *ret = NULL;
974 char *full_refname;
976 switch (dwim_ref(refname, strlen(refname), &oid, &full_refname, 0)) {
977 case 0:
978 die("No such ref: '%s'", refname);
979 case 1:
980 break; /* good */
981 default:
982 die("Ambiguous refname: '%s'", refname);
985 memset(&revs, 0, sizeof(revs));
986 revs.initial = 1;
987 for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs);
989 if (!revs.nr)
990 add_one_commit(&oid, &revs);
992 for (i = 0; i < revs.nr; i++)
993 revs.commit[i]->object.flags &= ~TMP_MARK;
995 bases = get_merge_bases_many(commit, revs.nr, revs.commit);
998 * There should be one and only one merge base, when we found
999 * a common ancestor among reflog entries.
1001 if (!bases || bases->next)
1002 goto cleanup_return;
1004 /* And the found one must be one of the reflog entries */
1005 for (i = 0; i < revs.nr; i++)
1006 if (&bases->item->object == &revs.commit[i]->object)
1007 break; /* found */
1008 if (revs.nr <= i)
1009 goto cleanup_return;
1011 ret = bases->item;
1013 cleanup_return:
1014 free_commit_list(bases);
1015 free(full_refname);
1016 return ret;
1020 * Indexed by hash algorithm identifier.
1022 static const char *gpg_sig_headers[] = {
1023 NULL,
1024 "gpgsig",
1025 "gpgsig-sha256",
1028 int sign_with_header(struct strbuf *buf, const char *keyid)
1030 struct strbuf sig = STRBUF_INIT;
1031 int inspos, copypos;
1032 const char *eoh;
1033 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
1034 int gpg_sig_header_len = strlen(gpg_sig_header);
1036 /* find the end of the header */
1037 eoh = strstr(buf->buf, "\n\n");
1038 if (!eoh)
1039 inspos = buf->len;
1040 else
1041 inspos = eoh - buf->buf + 1;
1043 if (!keyid || !*keyid)
1044 keyid = get_signing_key();
1045 if (sign_buffer(buf, &sig, keyid)) {
1046 strbuf_release(&sig);
1047 return -1;
1050 for (copypos = 0; sig.buf[copypos]; ) {
1051 const char *bol = sig.buf + copypos;
1052 const char *eol = strchrnul(bol, '\n');
1053 int len = (eol - bol) + !!*eol;
1055 if (!copypos) {
1056 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1057 inspos += gpg_sig_header_len;
1059 strbuf_insertstr(buf, inspos++, " ");
1060 strbuf_insert(buf, inspos, bol, len);
1061 inspos += len;
1062 copypos += len;
1064 strbuf_release(&sig);
1065 return 0;
1070 int parse_signed_commit(const struct commit *commit,
1071 struct strbuf *payload, struct strbuf *signature,
1072 const struct git_hash_algo *algop)
1074 unsigned long size;
1075 const char *buffer = get_commit_buffer(commit, &size);
1076 int ret = parse_buffer_signed_by_header(buffer, size, payload, signature, algop);
1078 unuse_commit_buffer(commit, buffer);
1079 return ret;
1082 int parse_buffer_signed_by_header(const char *buffer,
1083 unsigned long size,
1084 struct strbuf *payload,
1085 struct strbuf *signature,
1086 const struct git_hash_algo *algop)
1088 int in_signature = 0, saw_signature = 0, other_signature = 0;
1089 const char *line, *tail, *p;
1090 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(algop)];
1092 line = buffer;
1093 tail = buffer + size;
1094 while (line < tail) {
1095 const char *sig = NULL;
1096 const char *next = memchr(line, '\n', tail - line);
1098 next = next ? next + 1 : tail;
1099 if (in_signature && line[0] == ' ')
1100 sig = line + 1;
1101 else if (skip_prefix(line, gpg_sig_header, &p) &&
1102 *p == ' ') {
1103 sig = line + strlen(gpg_sig_header) + 1;
1104 other_signature = 0;
1106 else if (starts_with(line, "gpgsig"))
1107 other_signature = 1;
1108 else if (other_signature && line[0] != ' ')
1109 other_signature = 0;
1110 if (sig) {
1111 strbuf_add(signature, sig, next - sig);
1112 saw_signature = 1;
1113 in_signature = 1;
1114 } else {
1115 if (*line == '\n')
1116 /* dump the whole remainder of the buffer */
1117 next = tail;
1118 if (!other_signature)
1119 strbuf_add(payload, line, next - line);
1120 in_signature = 0;
1122 line = next;
1124 return saw_signature;
1127 int remove_signature(struct strbuf *buf)
1129 const char *line = buf->buf;
1130 const char *tail = buf->buf + buf->len;
1131 int in_signature = 0;
1132 struct sigbuf {
1133 const char *start;
1134 const char *end;
1135 } sigs[2], *sigp = &sigs[0];
1136 int i;
1137 const char *orig_buf = buf->buf;
1139 memset(sigs, 0, sizeof(sigs));
1141 while (line < tail) {
1142 const char *next = memchr(line, '\n', tail - line);
1143 next = next ? next + 1 : tail;
1145 if (in_signature && line[0] == ' ')
1146 sigp->end = next;
1147 else if (starts_with(line, "gpgsig")) {
1148 int i;
1149 for (i = 1; i < GIT_HASH_NALGOS; i++) {
1150 const char *p;
1151 if (skip_prefix(line, gpg_sig_headers[i], &p) &&
1152 *p == ' ') {
1153 sigp->start = line;
1154 sigp->end = next;
1155 in_signature = 1;
1158 } else {
1159 if (*line == '\n')
1160 /* dump the whole remainder of the buffer */
1161 next = tail;
1162 if (in_signature && sigp - sigs != ARRAY_SIZE(sigs))
1163 sigp++;
1164 in_signature = 0;
1166 line = next;
1169 for (i = ARRAY_SIZE(sigs) - 1; i >= 0; i--)
1170 if (sigs[i].start)
1171 strbuf_remove(buf, sigs[i].start - orig_buf, sigs[i].end - sigs[i].start);
1173 return sigs[0].start != NULL;
1176 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1178 struct merge_remote_desc *desc;
1179 struct commit_extra_header *mergetag;
1180 char *buf;
1181 unsigned long size;
1182 enum object_type type;
1183 struct strbuf payload = STRBUF_INIT;
1184 struct strbuf signature = STRBUF_INIT;
1186 desc = merge_remote_util(parent);
1187 if (!desc || !desc->obj)
1188 return;
1189 buf = read_object_file(&desc->obj->oid, &type, &size);
1190 if (!buf || type != OBJ_TAG)
1191 goto free_return;
1192 if (!parse_signature(buf, size, &payload, &signature))
1193 goto free_return;
1195 * We could verify this signature and either omit the tag when
1196 * it does not validate, but the integrator may not have the
1197 * public key of the signer of the tag being merged, while a
1198 * later auditor may have it while auditing, so let's not run
1199 * verify-signed-buffer here for now...
1201 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1202 * warn("warning: signed tag unverified.");
1204 CALLOC_ARRAY(mergetag, 1);
1205 mergetag->key = xstrdup("mergetag");
1206 mergetag->value = buf;
1207 mergetag->len = size;
1209 **tail = mergetag;
1210 *tail = &mergetag->next;
1211 strbuf_release(&payload);
1212 strbuf_release(&signature);
1213 return;
1215 free_return:
1216 free(buf);
1219 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1221 struct strbuf payload = STRBUF_INIT;
1222 struct strbuf signature = STRBUF_INIT;
1223 int ret = 1;
1225 sigc->result = 'N';
1227 if (parse_signed_commit(commit, &payload, &signature, the_hash_algo) <= 0)
1228 goto out;
1230 sigc->payload_type = SIGNATURE_PAYLOAD_COMMIT;
1231 sigc->payload = strbuf_detach(&payload, &sigc->payload_len);
1232 ret = check_signature(sigc, signature.buf, signature.len);
1234 out:
1235 strbuf_release(&payload);
1236 strbuf_release(&signature);
1238 return ret;
1241 void verify_merge_signature(struct commit *commit, int verbosity,
1242 int check_trust)
1244 char hex[GIT_MAX_HEXSZ + 1];
1245 struct signature_check signature_check;
1246 int ret;
1247 memset(&signature_check, 0, sizeof(signature_check));
1249 ret = check_commit_signature(commit, &signature_check);
1251 find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
1252 switch (signature_check.result) {
1253 case 'G':
1254 if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
1255 die(_("Commit %s has an untrusted GPG signature, "
1256 "allegedly by %s."), hex, signature_check.signer);
1257 break;
1258 case 'B':
1259 die(_("Commit %s has a bad GPG signature "
1260 "allegedly by %s."), hex, signature_check.signer);
1261 default: /* 'N' */
1262 die(_("Commit %s does not have a GPG signature."), hex);
1264 if (verbosity >= 0 && signature_check.result == 'G')
1265 printf(_("Commit %s has a good GPG signature by %s\n"),
1266 hex, signature_check.signer);
1268 signature_check_clear(&signature_check);
1271 void append_merge_tag_headers(struct commit_list *parents,
1272 struct commit_extra_header ***tail)
1274 while (parents) {
1275 struct commit *parent = parents->item;
1276 handle_signed_tag(parent, tail);
1277 parents = parents->next;
1281 static void add_extra_header(struct strbuf *buffer,
1282 struct commit_extra_header *extra)
1284 strbuf_addstr(buffer, extra->key);
1285 if (extra->len)
1286 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1287 else
1288 strbuf_addch(buffer, '\n');
1291 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1292 const char **exclude)
1294 struct commit_extra_header *extra = NULL;
1295 unsigned long size;
1296 const char *buffer = get_commit_buffer(commit, &size);
1297 extra = read_commit_extra_header_lines(buffer, size, exclude);
1298 unuse_commit_buffer(commit, buffer);
1299 return extra;
1302 int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1304 struct commit_extra_header *extra, *to_free;
1305 int res = 0;
1307 to_free = read_commit_extra_headers(commit, NULL);
1308 for (extra = to_free; !res && extra; extra = extra->next) {
1309 if (strcmp(extra->key, "mergetag"))
1310 continue; /* not a merge tag */
1311 res = fn(commit, extra, data);
1313 free_commit_extra_headers(to_free);
1314 return res;
1317 static inline int standard_header_field(const char *field, size_t len)
1319 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1320 (len == 6 && !memcmp(field, "parent", 6)) ||
1321 (len == 6 && !memcmp(field, "author", 6)) ||
1322 (len == 9 && !memcmp(field, "committer", 9)) ||
1323 (len == 8 && !memcmp(field, "encoding", 8)));
1326 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1328 if (!exclude)
1329 return 0;
1331 while (*exclude) {
1332 size_t xlen = strlen(*exclude);
1333 if (len == xlen && !memcmp(field, *exclude, xlen))
1334 return 1;
1335 exclude++;
1337 return 0;
1340 static struct commit_extra_header *read_commit_extra_header_lines(
1341 const char *buffer, size_t size,
1342 const char **exclude)
1344 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1345 const char *line, *next, *eof, *eob;
1346 struct strbuf buf = STRBUF_INIT;
1348 for (line = buffer, eob = line + size;
1349 line < eob && *line != '\n';
1350 line = next) {
1351 next = memchr(line, '\n', eob - line);
1352 next = next ? next + 1 : eob;
1353 if (*line == ' ') {
1354 /* continuation */
1355 if (it)
1356 strbuf_add(&buf, line + 1, next - (line + 1));
1357 continue;
1359 if (it)
1360 it->value = strbuf_detach(&buf, &it->len);
1361 strbuf_reset(&buf);
1362 it = NULL;
1364 eof = memchr(line, ' ', next - line);
1365 if (!eof)
1366 eof = next;
1367 else if (standard_header_field(line, eof - line) ||
1368 excluded_header_field(line, eof - line, exclude))
1369 continue;
1371 CALLOC_ARRAY(it, 1);
1372 it->key = xmemdupz(line, eof-line);
1373 *tail = it;
1374 tail = &it->next;
1375 if (eof + 1 < next)
1376 strbuf_add(&buf, eof + 1, next - (eof + 1));
1378 if (it)
1379 it->value = strbuf_detach(&buf, &it->len);
1380 return extra;
1383 void free_commit_extra_headers(struct commit_extra_header *extra)
1385 while (extra) {
1386 struct commit_extra_header *next = extra->next;
1387 free(extra->key);
1388 free(extra->value);
1389 free(extra);
1390 extra = next;
1394 int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1395 struct commit_list *parents, struct object_id *ret,
1396 const char *author, const char *sign_commit)
1398 struct commit_extra_header *extra = NULL, **tail = &extra;
1399 int result;
1401 append_merge_tag_headers(parents, &tail);
1402 result = commit_tree_extended(msg, msg_len, tree, parents, ret, author,
1403 NULL, sign_commit, extra);
1404 free_commit_extra_headers(extra);
1405 return result;
1408 static int find_invalid_utf8(const char *buf, int len)
1410 int offset = 0;
1411 static const unsigned int max_codepoint[] = {
1412 0x7f, 0x7ff, 0xffff, 0x10ffff
1415 while (len) {
1416 unsigned char c = *buf++;
1417 int bytes, bad_offset;
1418 unsigned int codepoint;
1419 unsigned int min_val, max_val;
1421 len--;
1422 offset++;
1424 /* Simple US-ASCII? No worries. */
1425 if (c < 0x80)
1426 continue;
1428 bad_offset = offset-1;
1431 * Count how many more high bits set: that's how
1432 * many more bytes this sequence should have.
1434 bytes = 0;
1435 while (c & 0x40) {
1436 c <<= 1;
1437 bytes++;
1441 * Must be between 1 and 3 more bytes. Longer sequences result in
1442 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1444 if (bytes < 1 || 3 < bytes)
1445 return bad_offset;
1447 /* Do we *have* that many bytes? */
1448 if (len < bytes)
1449 return bad_offset;
1452 * Place the encoded bits at the bottom of the value and compute the
1453 * valid range.
1455 codepoint = (c & 0x7f) >> bytes;
1456 min_val = max_codepoint[bytes-1] + 1;
1457 max_val = max_codepoint[bytes];
1459 offset += bytes;
1460 len -= bytes;
1462 /* And verify that they are good continuation bytes */
1463 do {
1464 codepoint <<= 6;
1465 codepoint |= *buf & 0x3f;
1466 if ((*buf++ & 0xc0) != 0x80)
1467 return bad_offset;
1468 } while (--bytes);
1470 /* Reject codepoints that are out of range for the sequence length. */
1471 if (codepoint < min_val || codepoint > max_val)
1472 return bad_offset;
1473 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1474 if ((codepoint & 0x1ff800) == 0xd800)
1475 return bad_offset;
1476 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1477 if ((codepoint & 0xfffe) == 0xfffe)
1478 return bad_offset;
1479 /* So are anything in the range U+FDD0..U+FDEF. */
1480 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1481 return bad_offset;
1483 return -1;
1487 * This verifies that the buffer is in proper utf8 format.
1489 * If it isn't, it assumes any non-utf8 characters are Latin1,
1490 * and does the conversion.
1492 static int verify_utf8(struct strbuf *buf)
1494 int ok = 1;
1495 long pos = 0;
1497 for (;;) {
1498 int bad;
1499 unsigned char c;
1500 unsigned char replace[2];
1502 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1503 if (bad < 0)
1504 return ok;
1505 pos += bad;
1506 ok = 0;
1507 c = buf->buf[pos];
1508 strbuf_remove(buf, pos, 1);
1510 /* We know 'c' must be in the range 128-255 */
1511 replace[0] = 0xc0 + (c >> 6);
1512 replace[1] = 0x80 + (c & 0x3f);
1513 strbuf_insert(buf, pos, replace, 2);
1514 pos += 2;
1518 static const char commit_utf8_warn[] =
1519 N_("Warning: commit message did not conform to UTF-8.\n"
1520 "You may want to amend it after fixing the message, or set the config\n"
1521 "variable i18n.commitEncoding to the encoding your project uses.\n");
1523 int commit_tree_extended(const char *msg, size_t msg_len,
1524 const struct object_id *tree,
1525 struct commit_list *parents, struct object_id *ret,
1526 const char *author, const char *committer,
1527 const char *sign_commit,
1528 struct commit_extra_header *extra)
1530 int result;
1531 int encoding_is_utf8;
1532 struct strbuf buffer;
1534 assert_oid_type(tree, OBJ_TREE);
1536 if (memchr(msg, '\0', msg_len))
1537 return error("a NUL byte in commit log message not allowed.");
1539 /* Not having i18n.commitencoding is the same as having utf-8 */
1540 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1542 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1543 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
1546 * NOTE! This ordering means that the same exact tree merged with a
1547 * different order of parents will be a _different_ changeset even
1548 * if everything else stays the same.
1550 while (parents) {
1551 struct commit *parent = pop_commit(&parents);
1552 strbuf_addf(&buffer, "parent %s\n",
1553 oid_to_hex(&parent->object.oid));
1556 /* Person/date information */
1557 if (!author)
1558 author = git_author_info(IDENT_STRICT);
1559 strbuf_addf(&buffer, "author %s\n", author);
1560 if (!committer)
1561 committer = git_committer_info(IDENT_STRICT);
1562 strbuf_addf(&buffer, "committer %s\n", committer);
1563 if (!encoding_is_utf8)
1564 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1566 while (extra) {
1567 add_extra_header(&buffer, extra);
1568 extra = extra->next;
1570 strbuf_addch(&buffer, '\n');
1572 /* And add the comment */
1573 strbuf_add(&buffer, msg, msg_len);
1575 /* And check the encoding */
1576 if (encoding_is_utf8 && !verify_utf8(&buffer))
1577 fprintf(stderr, _(commit_utf8_warn));
1579 if (sign_commit && sign_with_header(&buffer, sign_commit)) {
1580 result = -1;
1581 goto out;
1584 result = write_object_file(buffer.buf, buffer.len, OBJ_COMMIT, ret);
1585 out:
1586 strbuf_release(&buffer);
1587 return result;
1590 define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
1591 static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab);
1593 struct merge_remote_desc *merge_remote_util(struct commit *commit)
1595 return *merge_desc_slab_at(&merge_desc_slab, commit);
1598 void set_merge_remote_desc(struct commit *commit,
1599 const char *name, struct object *obj)
1601 struct merge_remote_desc *desc;
1602 FLEX_ALLOC_STR(desc, name, name);
1603 desc->obj = obj;
1604 *merge_desc_slab_at(&merge_desc_slab, commit) = desc;
1607 struct commit *get_merge_parent(const char *name)
1609 struct object *obj;
1610 struct commit *commit;
1611 struct object_id oid;
1612 if (get_oid(name, &oid))
1613 return NULL;
1614 obj = parse_object(the_repository, &oid);
1615 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1616 if (commit && !merge_remote_util(commit))
1617 set_merge_remote_desc(commit, name, obj);
1618 return commit;
1622 * Append a commit to the end of the commit_list.
1624 * next starts by pointing to the variable that holds the head of an
1625 * empty commit_list, and is updated to point to the "next" field of
1626 * the last item on the list as new commits are appended.
1628 * Usage example:
1630 * struct commit_list *list;
1631 * struct commit_list **next = &list;
1633 * next = commit_list_append(c1, next);
1634 * next = commit_list_append(c2, next);
1635 * assert(commit_list_count(list) == 2);
1636 * return list;
1638 struct commit_list **commit_list_append(struct commit *commit,
1639 struct commit_list **next)
1641 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1642 new_commit->item = commit;
1643 *next = new_commit;
1644 new_commit->next = NULL;
1645 return &new_commit->next;
1648 const char *find_header_mem(const char *msg, size_t len,
1649 const char *key, size_t *out_len)
1651 int key_len = strlen(key);
1652 const char *line = msg;
1655 * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
1656 * given by len. However, current callers are safe because they compute
1657 * len by scanning a NUL-terminated block of memory starting at msg.
1658 * Nonetheless, it would be better to ensure the function does not look
1659 * at msg beyond the len provided by the caller.
1661 while (line && line < msg + len) {
1662 const char *eol = strchrnul(line, '\n');
1664 if (line == eol)
1665 return NULL;
1667 if (eol - line > key_len &&
1668 !strncmp(line, key, key_len) &&
1669 line[key_len] == ' ') {
1670 *out_len = eol - line - key_len - 1;
1671 return line + key_len + 1;
1673 line = *eol ? eol + 1 : NULL;
1675 return NULL;
1678 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1680 return find_header_mem(msg, strlen(msg), key, out_len);
1683 * Inspect the given string and determine the true "end" of the log message, in
1684 * order to find where to put a new Signed-off-by trailer. Ignored are
1685 * trailing comment lines and blank lines. To support "git commit -s
1686 * --amend" on an existing commit, we also ignore "Conflicts:". To
1687 * support "git commit -v", we truncate at cut lines.
1689 * Returns the number of bytes from the tail to ignore, to be fed as
1690 * the second parameter to append_signoff().
1692 size_t ignore_non_trailer(const char *buf, size_t len)
1694 size_t boc = 0;
1695 size_t bol = 0;
1696 int in_old_conflicts_block = 0;
1697 size_t cutoff = wt_status_locate_end(buf, len);
1699 while (bol < cutoff) {
1700 const char *next_line = memchr(buf + bol, '\n', len - bol);
1702 if (!next_line)
1703 next_line = buf + len;
1704 else
1705 next_line++;
1707 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1708 /* is this the first of the run of comments? */
1709 if (!boc)
1710 boc = bol;
1711 /* otherwise, it is just continuing */
1712 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1713 in_old_conflicts_block = 1;
1714 if (!boc)
1715 boc = bol;
1716 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1717 ; /* a pathname in the conflicts block */
1718 } else if (boc) {
1719 /* the previous was not trailing comment */
1720 boc = 0;
1721 in_old_conflicts_block = 0;
1723 bol = next_line - buf;
1725 return boc ? len - boc : len - cutoff;
1728 int run_commit_hook(int editor_is_used, const char *index_file,
1729 int *invoked_hook, const char *name, ...)
1731 struct run_hooks_opt opt = RUN_HOOKS_OPT_INIT;
1732 va_list args;
1733 const char *arg;
1735 strvec_pushf(&opt.env, "GIT_INDEX_FILE=%s", index_file);
1738 * Let the hook know that no editor will be launched.
1740 if (!editor_is_used)
1741 strvec_push(&opt.env, "GIT_EDITOR=:");
1743 va_start(args, name);
1744 while ((arg = va_arg(args, const char *)))
1745 strvec_push(&opt.args, arg);
1746 va_end(args);
1748 opt.invoked_hook = invoked_hook;
1749 return run_hooks_opt(name, &opt);