4 #include "commit-graph.h"
5 #include "repository.h"
6 #include "object-store.h"
13 #include "gpg-interface.h"
14 #include "mergesort.h"
15 #include "commit-slab.h"
16 #include "prio-queue.h"
17 #include "sha1-lookup.h"
18 #include "wt-status.h"
21 #include "commit-reach.h"
22 #include "run-command.h"
25 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
27 int save_commit_buffer = 1;
29 const char *commit_type = "commit";
31 struct commit *lookup_commit_reference_gently(struct repository *r,
32 const struct object_id *oid, int quiet)
34 struct object *obj = deref_tag(r,
40 return object_as_type(obj, OBJ_COMMIT, quiet);
43 struct commit *lookup_commit_reference(struct repository *r, const struct object_id *oid)
45 return lookup_commit_reference_gently(r, oid, 0);
48 struct commit *lookup_commit_or_die(const struct object_id *oid, const char *ref_name)
50 struct commit *c = lookup_commit_reference(the_repository, oid);
52 die(_("could not parse %s"), ref_name);
53 if (!oideq(oid, &c->object.oid)) {
54 warning(_("%s %s is not a commit!"),
55 ref_name, oid_to_hex(oid));
60 struct commit *lookup_commit(struct repository *r, const struct object_id *oid)
62 struct object *obj = lookup_object(r, oid);
64 return create_object(r, oid, alloc_commit_node(r));
65 return object_as_type(obj, OBJ_COMMIT, 0);
68 struct commit *lookup_commit_reference_by_name(const char *name)
71 struct commit *commit;
73 if (get_oid_committish(name, &oid))
75 commit = lookup_commit_reference(the_repository, &oid);
76 if (parse_commit(commit))
81 static timestamp_t parse_commit_date(const char *buf, const char *tail)
87 if (memcmp(buf, "author", 6))
89 while (buf < tail && *buf++ != '\n')
93 if (memcmp(buf, "committer", 9))
95 while (buf < tail && *buf++ != '>')
100 while (buf < tail && *buf++ != '\n')
104 /* dateptr < buf && buf[-1] == '\n', so parsing will stop at buf-1 */
105 return parse_timestamp(dateptr, NULL, 10);
108 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
110 struct commit_graft **commit_graft_table = table;
111 return commit_graft_table[index]->oid.hash;
114 int commit_graft_pos(struct repository *r, const unsigned char *sha1)
116 return sha1_pos(sha1, r->parsed_objects->grafts,
117 r->parsed_objects->grafts_nr,
118 commit_graft_sha1_access);
121 int register_commit_graft(struct repository *r, struct commit_graft *graft,
124 int pos = commit_graft_pos(r, graft->oid.hash);
130 free(r->parsed_objects->grafts[pos]);
131 r->parsed_objects->grafts[pos] = graft;
136 ALLOC_GROW(r->parsed_objects->grafts,
137 r->parsed_objects->grafts_nr + 1,
138 r->parsed_objects->grafts_alloc);
139 r->parsed_objects->grafts_nr++;
140 if (pos < r->parsed_objects->grafts_nr)
141 memmove(r->parsed_objects->grafts + pos + 1,
142 r->parsed_objects->grafts + pos,
143 (r->parsed_objects->grafts_nr - pos - 1) *
144 sizeof(*r->parsed_objects->grafts));
145 r->parsed_objects->grafts[pos] = graft;
149 struct commit_graft *read_graft_line(struct strbuf *line)
151 /* The format is just "Commit Parent1 Parent2 ...\n" */
153 const char *tail = NULL;
154 struct commit_graft *graft = NULL;
155 struct object_id dummy_oid, *oid;
158 if (!line->len || line->buf[0] == '#')
161 * phase 0 verifies line, counts hashes in line and allocates graft
162 * phase 1 fills graft
164 for (phase = 0; phase < 2; phase++) {
165 oid = graft ? &graft->oid : &dummy_oid;
166 if (parse_oid_hex(line->buf, oid, &tail))
168 for (i = 0; *tail != '\0'; i++) {
169 oid = graft ? &graft->parent[i] : &dummy_oid;
170 if (!isspace(*tail++) || parse_oid_hex(tail, oid, &tail))
174 graft = xmalloc(st_add(sizeof(*graft),
175 st_mult(sizeof(struct object_id), i)));
176 graft->nr_parent = i;
182 error("bad graft data: %s", line->buf);
187 static int read_graft_file(struct repository *r, const char *graft_file)
189 FILE *fp = fopen_or_warn(graft_file, "r");
190 struct strbuf buf = STRBUF_INIT;
193 if (advice_graft_file_deprecated)
194 advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
195 "and will be removed in a future Git version.\n"
197 "Please use \"git replace --convert-graft-file\"\n"
198 "to convert the grafts into replace refs.\n"
200 "Turn this message off by running\n"
201 "\"git config advice.graftFileDeprecated false\""));
202 while (!strbuf_getwholeline(&buf, fp, '\n')) {
203 /* The format is just "Commit Parent1 Parent2 ...\n" */
204 struct commit_graft *graft = read_graft_line(&buf);
207 if (register_commit_graft(r, graft, 1))
208 error("duplicate graft data: %s", buf.buf);
211 strbuf_release(&buf);
215 void prepare_commit_graft(struct repository *r)
219 if (r->parsed_objects->commit_graft_prepared)
221 if (!startup_info->have_repository)
224 graft_file = get_graft_file(r);
225 read_graft_file(r, graft_file);
226 /* make sure shallows are read */
227 is_repository_shallow(r);
228 r->parsed_objects->commit_graft_prepared = 1;
231 struct commit_graft *lookup_commit_graft(struct repository *r, const struct object_id *oid)
234 prepare_commit_graft(r);
235 pos = commit_graft_pos(r, oid->hash);
238 return r->parsed_objects->grafts[pos];
241 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
244 for (i = ret = 0; i < the_repository->parsed_objects->grafts_nr && !ret; i++)
245 ret = fn(the_repository->parsed_objects->grafts[i], cb_data);
249 struct commit_buffer {
253 define_commit_slab(buffer_slab, struct commit_buffer);
255 struct buffer_slab *allocate_commit_buffer_slab(void)
257 struct buffer_slab *bs = xmalloc(sizeof(*bs));
258 init_buffer_slab(bs);
262 void free_commit_buffer_slab(struct buffer_slab *bs)
264 clear_buffer_slab(bs);
268 void set_commit_buffer(struct repository *r, struct commit *commit, void *buffer, unsigned long size)
270 struct commit_buffer *v = buffer_slab_at(
271 r->parsed_objects->buffer_slab, commit);
276 const void *get_cached_commit_buffer(struct repository *r, const struct commit *commit, unsigned long *sizep)
278 struct commit_buffer *v = buffer_slab_peek(
279 r->parsed_objects->buffer_slab, commit);
290 const void *repo_get_commit_buffer(struct repository *r,
291 const struct commit *commit,
292 unsigned long *sizep)
294 const void *ret = get_cached_commit_buffer(r, commit, sizep);
296 enum object_type type;
298 ret = repo_read_object_file(r, &commit->object.oid, &type, &size);
300 die("cannot read commit object %s",
301 oid_to_hex(&commit->object.oid));
302 if (type != OBJ_COMMIT)
303 die("expected commit for %s, got %s",
304 oid_to_hex(&commit->object.oid), type_name(type));
311 void repo_unuse_commit_buffer(struct repository *r,
312 const struct commit *commit,
315 struct commit_buffer *v = buffer_slab_peek(
316 r->parsed_objects->buffer_slab, commit);
317 if (!(v && v->buffer == buffer))
318 free((void *)buffer);
321 void free_commit_buffer(struct parsed_object_pool *pool, struct commit *commit)
323 struct commit_buffer *v = buffer_slab_peek(
324 pool->buffer_slab, commit);
326 FREE_AND_NULL(v->buffer);
331 static inline void set_commit_tree(struct commit *c, struct tree *t)
336 struct tree *repo_get_commit_tree(struct repository *r,
337 const struct commit *commit)
339 if (commit->maybe_tree || !commit->object.parsed)
340 return commit->maybe_tree;
342 if (commit_graph_position(commit) != COMMIT_NOT_FROM_GRAPH)
343 return get_commit_tree_in_graph(r, commit);
348 struct object_id *get_commit_tree_oid(const struct commit *commit)
350 struct tree *tree = get_commit_tree(commit);
351 return tree ? &tree->object.oid : NULL;
354 void release_commit_memory(struct parsed_object_pool *pool, struct commit *c)
356 set_commit_tree(c, NULL);
357 free_commit_buffer(pool, c);
359 free_commit_list(c->parents);
361 c->object.parsed = 0;
364 const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
366 struct commit_buffer *v = buffer_slab_peek(
367 the_repository->parsed_objects->buffer_slab, commit);
384 int parse_commit_buffer(struct repository *r, struct commit *item, const void *buffer, unsigned long size, int check_graph)
386 const char *tail = buffer;
387 const char *bufptr = buffer;
388 struct object_id parent;
389 struct commit_list **pptr;
390 struct commit_graft *graft;
391 const int tree_entry_len = the_hash_algo->hexsz + 5;
392 const int parent_entry_len = the_hash_algo->hexsz + 7;
395 if (item->object.parsed)
400 * Presumably this is leftover from an earlier failed parse;
401 * clear it out in preparation for us re-parsing (we'll hit the
402 * same error, but that's good, since it lets our caller know
403 * the result cannot be trusted.
405 free_commit_list(item->parents);
406 item->parents = NULL;
410 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
411 bufptr[tree_entry_len] != '\n')
412 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
413 if (get_oid_hex(bufptr + 5, &parent) < 0)
414 return error("bad tree pointer in commit %s",
415 oid_to_hex(&item->object.oid));
416 tree = lookup_tree(r, &parent);
418 return error("bad tree pointer %s in commit %s",
420 oid_to_hex(&item->object.oid));
421 set_commit_tree(item, tree);
422 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
423 pptr = &item->parents;
425 graft = lookup_commit_graft(r, &item->object.oid);
426 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
427 struct commit *new_parent;
429 if (tail <= bufptr + parent_entry_len + 1 ||
430 get_oid_hex(bufptr + 7, &parent) ||
431 bufptr[parent_entry_len] != '\n')
432 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
433 bufptr += parent_entry_len + 1;
435 * The clone is shallow if nr_parent < 0, and we must
436 * not traverse its real parents even when we unhide them.
438 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
440 new_parent = lookup_commit(r, &parent);
442 return error("bad parent %s in commit %s",
444 oid_to_hex(&item->object.oid));
445 pptr = &commit_list_insert(new_parent, pptr)->next;
449 struct commit *new_parent;
450 for (i = 0; i < graft->nr_parent; i++) {
451 new_parent = lookup_commit(r,
454 return error("bad graft parent %s in commit %s",
455 oid_to_hex(&graft->parent[i]),
456 oid_to_hex(&item->object.oid));
457 pptr = &commit_list_insert(new_parent, pptr)->next;
460 item->date = parse_commit_date(bufptr, tail);
463 load_commit_graph_info(r, item);
465 item->object.parsed = 1;
469 int repo_parse_commit_internal(struct repository *r,
471 int quiet_on_missing,
472 int use_commit_graph)
474 enum object_type type;
481 if (item->object.parsed)
483 if (use_commit_graph && parse_commit_in_graph(r, item))
485 buffer = repo_read_object_file(r, &item->object.oid, &type, &size);
487 return quiet_on_missing ? -1 :
488 error("Could not read %s",
489 oid_to_hex(&item->object.oid));
490 if (type != OBJ_COMMIT) {
492 return error("Object %s not a commit",
493 oid_to_hex(&item->object.oid));
496 ret = parse_commit_buffer(r, item, buffer, size, 0);
497 if (save_commit_buffer && !ret) {
498 set_commit_buffer(r, item, buffer, size);
505 int repo_parse_commit_gently(struct repository *r,
506 struct commit *item, int quiet_on_missing)
508 return repo_parse_commit_internal(r, item, quiet_on_missing, 1);
511 void parse_commit_or_die(struct commit *item)
513 if (parse_commit(item))
514 die("unable to parse commit %s",
515 item ? oid_to_hex(&item->object.oid) : "(null)");
518 int find_commit_subject(const char *commit_buffer, const char **subject)
521 const char *p = commit_buffer;
523 while (*p && (*p != '\n' || p[1] != '\n'))
526 p = skip_blank_lines(p + 2);
527 eol = strchrnul(p, '\n');
536 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
538 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
539 new_list->item = item;
540 new_list->next = *list_p;
545 unsigned commit_list_count(const struct commit_list *l)
548 for (; l; l = l->next )
553 struct commit_list *copy_commit_list(struct commit_list *list)
555 struct commit_list *head = NULL;
556 struct commit_list **pp = &head;
558 pp = commit_list_append(list->item, pp);
564 void free_commit_list(struct commit_list *list)
570 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
572 struct commit_list **pp = list;
573 struct commit_list *p;
574 while ((p = *pp) != NULL) {
575 if (p->item->date < item->date) {
580 return commit_list_insert(item, pp);
583 static int commit_list_compare_by_date(const void *a, const void *b)
585 timestamp_t a_date = ((const struct commit_list *)a)->item->date;
586 timestamp_t b_date = ((const struct commit_list *)b)->item->date;
594 static void *commit_list_get_next(const void *a)
596 return ((const struct commit_list *)a)->next;
599 static void commit_list_set_next(void *a, void *next)
601 ((struct commit_list *)a)->next = next;
604 void commit_list_sort_by_date(struct commit_list **list)
606 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
607 commit_list_compare_by_date);
610 struct commit *pop_most_recent_commit(struct commit_list **list,
613 struct commit *ret = pop_commit(list);
614 struct commit_list *parents = ret->parents;
617 struct commit *commit = parents->item;
618 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
619 commit->object.flags |= mark;
620 commit_list_insert_by_date(commit, list);
622 parents = parents->next;
627 static void clear_commit_marks_1(struct commit_list **plist,
628 struct commit *commit, unsigned int mark)
631 struct commit_list *parents;
633 if (!(mark & commit->object.flags))
636 commit->object.flags &= ~mark;
638 parents = commit->parents;
642 while ((parents = parents->next))
643 commit_list_insert(parents->item, plist);
645 commit = commit->parents->item;
649 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
651 struct commit_list *list = NULL;
654 clear_commit_marks_1(&list, *commit, mark);
658 clear_commit_marks_1(&list, pop_commit(&list), mark);
661 void clear_commit_marks(struct commit *commit, unsigned int mark)
663 clear_commit_marks_many(1, &commit, mark);
666 struct commit *pop_commit(struct commit_list **stack)
668 struct commit_list *top = *stack;
669 struct commit *item = top ? top->item : NULL;
679 * Topological sort support
682 /* count number of children that have not been emitted */
683 define_commit_slab(indegree_slab, int);
685 define_commit_slab(author_date_slab, timestamp_t);
687 void record_author_date(struct author_date_slab *author_date,
688 struct commit *commit)
690 const char *buffer = get_commit_buffer(commit, NULL);
691 struct ident_split ident;
692 const char *ident_line;
697 ident_line = find_commit_header(buffer, "author", &ident_len);
699 goto fail_exit; /* no author line */
700 if (split_ident_line(&ident, ident_line, ident_len) ||
701 !ident.date_begin || !ident.date_end)
702 goto fail_exit; /* malformed "author" line */
704 date = parse_timestamp(ident.date_begin, &date_end, 10);
705 if (date_end != ident.date_end)
706 goto fail_exit; /* malformed date */
707 *(author_date_slab_at(author_date, commit)) = date;
710 unuse_commit_buffer(commit, buffer);
713 int compare_commits_by_author_date(const void *a_, const void *b_,
716 const struct commit *a = a_, *b = b_;
717 struct author_date_slab *author_date = cb_data;
718 timestamp_t a_date = *(author_date_slab_at(author_date, a));
719 timestamp_t b_date = *(author_date_slab_at(author_date, b));
721 /* newer commits with larger date first */
724 else if (a_date > b_date)
729 int compare_commits_by_gen_then_commit_date(const void *a_, const void *b_, void *unused)
731 const struct commit *a = a_, *b = b_;
732 const uint32_t generation_a = commit_graph_generation(a),
733 generation_b = commit_graph_generation(b);
735 /* newer commits first */
736 if (generation_a < generation_b)
738 else if (generation_a > generation_b)
741 /* use date as a heuristic when generations are equal */
742 if (a->date < b->date)
744 else if (a->date > b->date)
749 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
751 const struct commit *a = a_, *b = b_;
752 /* newer commits with larger date first */
753 if (a->date < b->date)
755 else if (a->date > b->date)
761 * Performs an in-place topological sort on the list supplied.
763 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
765 struct commit_list *next, *orig = *list;
766 struct commit_list **pptr;
767 struct indegree_slab indegree;
768 struct prio_queue queue;
769 struct commit *commit;
770 struct author_date_slab author_date;
776 init_indegree_slab(&indegree);
777 memset(&queue, '\0', sizeof(queue));
779 switch (sort_order) {
780 default: /* REV_SORT_IN_GRAPH_ORDER */
781 queue.compare = NULL;
783 case REV_SORT_BY_COMMIT_DATE:
784 queue.compare = compare_commits_by_commit_date;
786 case REV_SORT_BY_AUTHOR_DATE:
787 init_author_date_slab(&author_date);
788 queue.compare = compare_commits_by_author_date;
789 queue.cb_data = &author_date;
793 /* Mark them and clear the indegree */
794 for (next = orig; next; next = next->next) {
795 struct commit *commit = next->item;
796 *(indegree_slab_at(&indegree, commit)) = 1;
797 /* also record the author dates, if needed */
798 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
799 record_author_date(&author_date, commit);
802 /* update the indegree */
803 for (next = orig; next; next = next->next) {
804 struct commit_list *parents = next->item->parents;
806 struct commit *parent = parents->item;
807 int *pi = indegree_slab_at(&indegree, parent);
811 parents = parents->next;
818 * tips are nodes not reachable from any other node in the list
820 * the tips serve as a starting set for the work queue.
822 for (next = orig; next; next = next->next) {
823 struct commit *commit = next->item;
825 if (*(indegree_slab_at(&indegree, commit)) == 1)
826 prio_queue_put(&queue, commit);
830 * This is unfortunate; the initial tips need to be shown
831 * in the order given from the revision traversal machinery.
833 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
834 prio_queue_reverse(&queue);
836 /* We no longer need the commit list */
837 free_commit_list(orig);
841 while ((commit = prio_queue_get(&queue)) != NULL) {
842 struct commit_list *parents;
844 for (parents = commit->parents; parents ; parents = parents->next) {
845 struct commit *parent = parents->item;
846 int *pi = indegree_slab_at(&indegree, parent);
852 * parents are only enqueued for emission
853 * when all their children have been emitted thereby
854 * guaranteeing topological order.
857 prio_queue_put(&queue, parent);
860 * all children of commit have already been
861 * emitted. we can emit it now.
863 *(indegree_slab_at(&indegree, commit)) = 0;
865 pptr = &commit_list_insert(commit, pptr)->next;
868 clear_indegree_slab(&indegree);
869 clear_prio_queue(&queue);
870 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
871 clear_author_date_slab(&author_date);
875 struct commit **commit;
878 unsigned int initial : 1;
881 static void add_one_commit(struct object_id *oid, struct rev_collect *revs)
883 struct commit *commit;
885 if (is_null_oid(oid))
888 commit = lookup_commit(the_repository, oid);
890 (commit->object.flags & TMP_MARK) ||
891 parse_commit(commit))
894 ALLOC_GROW(revs->commit, revs->nr + 1, revs->alloc);
895 revs->commit[revs->nr++] = commit;
896 commit->object.flags |= TMP_MARK;
899 static int collect_one_reflog_ent(struct object_id *ooid, struct object_id *noid,
900 const char *ident, timestamp_t timestamp,
901 int tz, const char *message, void *cbdata)
903 struct rev_collect *revs = cbdata;
907 add_one_commit(ooid, revs);
909 add_one_commit(noid, revs);
913 struct commit *get_fork_point(const char *refname, struct commit *commit)
915 struct object_id oid;
916 struct rev_collect revs;
917 struct commit_list *bases;
919 struct commit *ret = NULL;
922 switch (dwim_ref(refname, strlen(refname), &oid, &full_refname)) {
924 die("No such ref: '%s'", refname);
928 die("Ambiguous refname: '%s'", refname);
931 memset(&revs, 0, sizeof(revs));
933 for_each_reflog_ent(full_refname, collect_one_reflog_ent, &revs);
936 add_one_commit(&oid, &revs);
938 for (i = 0; i < revs.nr; i++)
939 revs.commit[i]->object.flags &= ~TMP_MARK;
941 bases = get_merge_bases_many(commit, revs.nr, revs.commit);
944 * There should be one and only one merge base, when we found
945 * a common ancestor among reflog entries.
947 if (!bases || bases->next)
950 /* And the found one must be one of the reflog entries */
951 for (i = 0; i < revs.nr; i++)
952 if (&bases->item->object == &revs.commit[i]->object)
960 free_commit_list(bases);
966 * Indexed by hash algorithm identifier.
968 static const char *gpg_sig_headers[] = {
974 static int do_sign_commit(struct strbuf *buf, const char *keyid)
976 struct strbuf sig = STRBUF_INIT;
979 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
980 int gpg_sig_header_len = strlen(gpg_sig_header);
982 /* find the end of the header */
983 eoh = strstr(buf->buf, "\n\n");
987 inspos = eoh - buf->buf + 1;
989 if (!keyid || !*keyid)
990 keyid = get_signing_key();
991 if (sign_buffer(buf, &sig, keyid)) {
992 strbuf_release(&sig);
996 for (copypos = 0; sig.buf[copypos]; ) {
997 const char *bol = sig.buf + copypos;
998 const char *eol = strchrnul(bol, '\n');
999 int len = (eol - bol) + !!*eol;
1002 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1003 inspos += gpg_sig_header_len;
1005 strbuf_insertstr(buf, inspos++, " ");
1006 strbuf_insert(buf, inspos, bol, len);
1010 strbuf_release(&sig);
1014 int parse_signed_commit(const struct commit *commit,
1015 struct strbuf *payload, struct strbuf *signature)
1019 const char *buffer = get_commit_buffer(commit, &size);
1020 int in_signature, saw_signature = -1;
1021 const char *line, *tail;
1022 const char *gpg_sig_header = gpg_sig_headers[hash_algo_by_ptr(the_hash_algo)];
1023 int gpg_sig_header_len = strlen(gpg_sig_header);
1026 tail = buffer + size;
1029 while (line < tail) {
1030 const char *sig = NULL;
1031 const char *next = memchr(line, '\n', tail - line);
1033 next = next ? next + 1 : tail;
1034 if (in_signature && line[0] == ' ')
1036 else if (starts_with(line, gpg_sig_header) &&
1037 line[gpg_sig_header_len] == ' ')
1038 sig = line + gpg_sig_header_len + 1;
1040 strbuf_add(signature, sig, next - sig);
1045 /* dump the whole remainder of the buffer */
1047 strbuf_add(payload, line, next - line);
1052 unuse_commit_buffer(commit, buffer);
1053 return saw_signature;
1056 int remove_signature(struct strbuf *buf)
1058 const char *line = buf->buf;
1059 const char *tail = buf->buf + buf->len;
1060 int in_signature = 0;
1061 const char *sig_start = NULL;
1062 const char *sig_end = NULL;
1064 while (line < tail) {
1065 const char *next = memchr(line, '\n', tail - line);
1066 next = next ? next + 1 : tail;
1068 if (in_signature && line[0] == ' ')
1070 else if (starts_with(line, "gpgsig")) {
1072 for (i = 1; i < GIT_HASH_NALGOS; i++) {
1074 if (skip_prefix(line, gpg_sig_headers[i], &p) &&
1083 /* dump the whole remainder of the buffer */
1091 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1093 return sig_start != NULL;
1096 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1098 struct merge_remote_desc *desc;
1099 struct commit_extra_header *mergetag;
1101 unsigned long size, len;
1102 enum object_type type;
1104 desc = merge_remote_util(parent);
1105 if (!desc || !desc->obj)
1107 buf = read_object_file(&desc->obj->oid, &type, &size);
1108 if (!buf || type != OBJ_TAG)
1110 len = parse_signature(buf, size);
1114 * We could verify this signature and either omit the tag when
1115 * it does not validate, but the integrator may not have the
1116 * public key of the signer of the tag he is merging, while a
1117 * later auditor may have it while auditing, so let's not run
1118 * verify-signed-buffer here for now...
1120 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1121 * warn("warning: signed tag unverified.");
1123 mergetag = xcalloc(1, sizeof(*mergetag));
1124 mergetag->key = xstrdup("mergetag");
1125 mergetag->value = buf;
1126 mergetag->len = size;
1129 *tail = &mergetag->next;
1136 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1138 struct strbuf payload = STRBUF_INIT;
1139 struct strbuf signature = STRBUF_INIT;
1144 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1146 ret = check_signature(payload.buf, payload.len, signature.buf,
1147 signature.len, sigc);
1150 strbuf_release(&payload);
1151 strbuf_release(&signature);
1156 void verify_merge_signature(struct commit *commit, int verbosity,
1159 char hex[GIT_MAX_HEXSZ + 1];
1160 struct signature_check signature_check;
1162 memset(&signature_check, 0, sizeof(signature_check));
1164 ret = check_commit_signature(commit, &signature_check);
1166 find_unique_abbrev_r(hex, &commit->object.oid, DEFAULT_ABBREV);
1167 switch (signature_check.result) {
1169 if (ret || (check_trust && signature_check.trust_level < TRUST_MARGINAL))
1170 die(_("Commit %s has an untrusted GPG signature, "
1171 "allegedly by %s."), hex, signature_check.signer);
1174 die(_("Commit %s has a bad GPG signature "
1175 "allegedly by %s."), hex, signature_check.signer);
1177 die(_("Commit %s does not have a GPG signature."), hex);
1179 if (verbosity >= 0 && signature_check.result == 'G')
1180 printf(_("Commit %s has a good GPG signature by %s\n"),
1181 hex, signature_check.signer);
1183 signature_check_clear(&signature_check);
1186 void append_merge_tag_headers(struct commit_list *parents,
1187 struct commit_extra_header ***tail)
1190 struct commit *parent = parents->item;
1191 handle_signed_tag(parent, tail);
1192 parents = parents->next;
1196 static void add_extra_header(struct strbuf *buffer,
1197 struct commit_extra_header *extra)
1199 strbuf_addstr(buffer, extra->key);
1201 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1203 strbuf_addch(buffer, '\n');
1206 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1207 const char **exclude)
1209 struct commit_extra_header *extra = NULL;
1211 const char *buffer = get_commit_buffer(commit, &size);
1212 extra = read_commit_extra_header_lines(buffer, size, exclude);
1213 unuse_commit_buffer(commit, buffer);
1217 int for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1219 struct commit_extra_header *extra, *to_free;
1222 to_free = read_commit_extra_headers(commit, NULL);
1223 for (extra = to_free; !res && extra; extra = extra->next) {
1224 if (strcmp(extra->key, "mergetag"))
1225 continue; /* not a merge tag */
1226 res = fn(commit, extra, data);
1228 free_commit_extra_headers(to_free);
1232 static inline int standard_header_field(const char *field, size_t len)
1234 return ((len == 4 && !memcmp(field, "tree", 4)) ||
1235 (len == 6 && !memcmp(field, "parent", 6)) ||
1236 (len == 6 && !memcmp(field, "author", 6)) ||
1237 (len == 9 && !memcmp(field, "committer", 9)) ||
1238 (len == 8 && !memcmp(field, "encoding", 8)));
1241 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1247 size_t xlen = strlen(*exclude);
1248 if (len == xlen && !memcmp(field, *exclude, xlen))
1255 static struct commit_extra_header *read_commit_extra_header_lines(
1256 const char *buffer, size_t size,
1257 const char **exclude)
1259 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1260 const char *line, *next, *eof, *eob;
1261 struct strbuf buf = STRBUF_INIT;
1263 for (line = buffer, eob = line + size;
1264 line < eob && *line != '\n';
1266 next = memchr(line, '\n', eob - line);
1267 next = next ? next + 1 : eob;
1271 strbuf_add(&buf, line + 1, next - (line + 1));
1275 it->value = strbuf_detach(&buf, &it->len);
1279 eof = memchr(line, ' ', next - line);
1282 else if (standard_header_field(line, eof - line) ||
1283 excluded_header_field(line, eof - line, exclude))
1286 it = xcalloc(1, sizeof(*it));
1287 it->key = xmemdupz(line, eof-line);
1291 strbuf_add(&buf, eof + 1, next - (eof + 1));
1294 it->value = strbuf_detach(&buf, &it->len);
1298 void free_commit_extra_headers(struct commit_extra_header *extra)
1301 struct commit_extra_header *next = extra->next;
1309 int commit_tree(const char *msg, size_t msg_len, const struct object_id *tree,
1310 struct commit_list *parents, struct object_id *ret,
1311 const char *author, const char *sign_commit)
1313 struct commit_extra_header *extra = NULL, **tail = &extra;
1316 append_merge_tag_headers(parents, &tail);
1317 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1318 author, sign_commit, extra);
1319 free_commit_extra_headers(extra);
1323 static int find_invalid_utf8(const char *buf, int len)
1326 static const unsigned int max_codepoint[] = {
1327 0x7f, 0x7ff, 0xffff, 0x10ffff
1331 unsigned char c = *buf++;
1332 int bytes, bad_offset;
1333 unsigned int codepoint;
1334 unsigned int min_val, max_val;
1339 /* Simple US-ASCII? No worries. */
1343 bad_offset = offset-1;
1346 * Count how many more high bits set: that's how
1347 * many more bytes this sequence should have.
1356 * Must be between 1 and 3 more bytes. Longer sequences result in
1357 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1359 if (bytes < 1 || 3 < bytes)
1362 /* Do we *have* that many bytes? */
1367 * Place the encoded bits at the bottom of the value and compute the
1370 codepoint = (c & 0x7f) >> bytes;
1371 min_val = max_codepoint[bytes-1] + 1;
1372 max_val = max_codepoint[bytes];
1377 /* And verify that they are good continuation bytes */
1380 codepoint |= *buf & 0x3f;
1381 if ((*buf++ & 0xc0) != 0x80)
1385 /* Reject codepoints that are out of range for the sequence length. */
1386 if (codepoint < min_val || codepoint > max_val)
1388 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1389 if ((codepoint & 0x1ff800) == 0xd800)
1391 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1392 if ((codepoint & 0xfffe) == 0xfffe)
1394 /* So are anything in the range U+FDD0..U+FDEF. */
1395 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1402 * This verifies that the buffer is in proper utf8 format.
1404 * If it isn't, it assumes any non-utf8 characters are Latin1,
1405 * and does the conversion.
1407 static int verify_utf8(struct strbuf *buf)
1415 unsigned char replace[2];
1417 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1423 strbuf_remove(buf, pos, 1);
1425 /* We know 'c' must be in the range 128-255 */
1426 replace[0] = 0xc0 + (c >> 6);
1427 replace[1] = 0x80 + (c & 0x3f);
1428 strbuf_insert(buf, pos, replace, 2);
1433 static const char commit_utf8_warn[] =
1434 N_("Warning: commit message did not conform to UTF-8.\n"
1435 "You may want to amend it after fixing the message, or set the config\n"
1436 "variable i18n.commitencoding to the encoding your project uses.\n");
1438 int commit_tree_extended(const char *msg, size_t msg_len,
1439 const struct object_id *tree,
1440 struct commit_list *parents, struct object_id *ret,
1441 const char *author, const char *sign_commit,
1442 struct commit_extra_header *extra)
1445 int encoding_is_utf8;
1446 struct strbuf buffer;
1448 assert_oid_type(tree, OBJ_TREE);
1450 if (memchr(msg, '\0', msg_len))
1451 return error("a NUL byte in commit log message not allowed.");
1453 /* Not having i18n.commitencoding is the same as having utf-8 */
1454 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1456 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1457 strbuf_addf(&buffer, "tree %s\n", oid_to_hex(tree));
1460 * NOTE! This ordering means that the same exact tree merged with a
1461 * different order of parents will be a _different_ changeset even
1462 * if everything else stays the same.
1465 struct commit *parent = pop_commit(&parents);
1466 strbuf_addf(&buffer, "parent %s\n",
1467 oid_to_hex(&parent->object.oid));
1470 /* Person/date information */
1472 author = git_author_info(IDENT_STRICT);
1473 strbuf_addf(&buffer, "author %s\n", author);
1474 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1475 if (!encoding_is_utf8)
1476 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1479 add_extra_header(&buffer, extra);
1480 extra = extra->next;
1482 strbuf_addch(&buffer, '\n');
1484 /* And add the comment */
1485 strbuf_add(&buffer, msg, msg_len);
1487 /* And check the encoding */
1488 if (encoding_is_utf8 && !verify_utf8(&buffer))
1489 fprintf(stderr, _(commit_utf8_warn));
1491 if (sign_commit && do_sign_commit(&buffer, sign_commit)) {
1496 result = write_object_file(buffer.buf, buffer.len, commit_type, ret);
1498 strbuf_release(&buffer);
1502 define_commit_slab(merge_desc_slab, struct merge_remote_desc *);
1503 static struct merge_desc_slab merge_desc_slab = COMMIT_SLAB_INIT(1, merge_desc_slab);
1505 struct merge_remote_desc *merge_remote_util(struct commit *commit)
1507 return *merge_desc_slab_at(&merge_desc_slab, commit);
1510 void set_merge_remote_desc(struct commit *commit,
1511 const char *name, struct object *obj)
1513 struct merge_remote_desc *desc;
1514 FLEX_ALLOC_STR(desc, name, name);
1516 *merge_desc_slab_at(&merge_desc_slab, commit) = desc;
1519 struct commit *get_merge_parent(const char *name)
1522 struct commit *commit;
1523 struct object_id oid;
1524 if (get_oid(name, &oid))
1526 obj = parse_object(the_repository, &oid);
1527 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1528 if (commit && !merge_remote_util(commit))
1529 set_merge_remote_desc(commit, name, obj);
1534 * Append a commit to the end of the commit_list.
1536 * next starts by pointing to the variable that holds the head of an
1537 * empty commit_list, and is updated to point to the "next" field of
1538 * the last item on the list as new commits are appended.
1542 * struct commit_list *list;
1543 * struct commit_list **next = &list;
1545 * next = commit_list_append(c1, next);
1546 * next = commit_list_append(c2, next);
1547 * assert(commit_list_count(list) == 2);
1550 struct commit_list **commit_list_append(struct commit *commit,
1551 struct commit_list **next)
1553 struct commit_list *new_commit = xmalloc(sizeof(struct commit_list));
1554 new_commit->item = commit;
1556 new_commit->next = NULL;
1557 return &new_commit->next;
1560 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1562 int key_len = strlen(key);
1563 const char *line = msg;
1566 const char *eol = strchrnul(line, '\n');
1571 if (eol - line > key_len &&
1572 !strncmp(line, key, key_len) &&
1573 line[key_len] == ' ') {
1574 *out_len = eol - line - key_len - 1;
1575 return line + key_len + 1;
1577 line = *eol ? eol + 1 : NULL;
1583 * Inspect the given string and determine the true "end" of the log message, in
1584 * order to find where to put a new Signed-off-by: line. Ignored are
1585 * trailing comment lines and blank lines. To support "git commit -s
1586 * --amend" on an existing commit, we also ignore "Conflicts:". To
1587 * support "git commit -v", we truncate at cut lines.
1589 * Returns the number of bytes from the tail to ignore, to be fed as
1590 * the second parameter to append_signoff().
1592 size_t ignore_non_trailer(const char *buf, size_t len)
1596 int in_old_conflicts_block = 0;
1597 size_t cutoff = wt_status_locate_end(buf, len);
1599 while (bol < cutoff) {
1600 const char *next_line = memchr(buf + bol, '\n', len - bol);
1603 next_line = buf + len;
1607 if (buf[bol] == comment_line_char || buf[bol] == '\n') {
1608 /* is this the first of the run of comments? */
1611 /* otherwise, it is just continuing */
1612 } else if (starts_with(buf + bol, "Conflicts:\n")) {
1613 in_old_conflicts_block = 1;
1616 } else if (in_old_conflicts_block && buf[bol] == '\t') {
1617 ; /* a pathname in the conflicts block */
1619 /* the previous was not trailing comment */
1621 in_old_conflicts_block = 0;
1623 bol = next_line - buf;
1625 return boc ? len - boc : len - cutoff;
1628 int run_commit_hook(int editor_is_used, const char *index_file,
1629 const char *name, ...)
1631 struct argv_array hook_env = ARGV_ARRAY_INIT;
1635 argv_array_pushf(&hook_env, "GIT_INDEX_FILE=%s", index_file);
1638 * Let the hook know that no editor will be launched.
1640 if (!editor_is_used)
1641 argv_array_push(&hook_env, "GIT_EDITOR=:");
1643 va_start(args, name);
1644 ret = run_hook_ve(hook_env.argv,name, args);
1646 argv_array_clear(&hook_env);