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(r
, 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(r
, 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_pos
!= 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_
;
733 /* newer commits first */
734 if (a
->generation
< b
->generation
)
736 else if (a
->generation
> b
->generation
)
739 /* use date as a heuristic when generations are equal */
740 if (a
->date
< b
->date
)
742 else if (a
->date
> b
->date
)
747 int compare_commits_by_commit_date(const void *a_
, const void *b_
, void *unused
)
749 const struct commit
*a
= a_
, *b
= b_
;
750 /* newer commits with larger date first */
751 if (a
->date
< b
->date
)
753 else if (a
->date
> b
->date
)
759 * Performs an in-place topological sort on the list supplied.
761 void sort_in_topological_order(struct commit_list
**list
, enum rev_sort_order sort_order
)
763 struct commit_list
*next
, *orig
= *list
;
764 struct commit_list
**pptr
;
765 struct indegree_slab indegree
;
766 struct prio_queue queue
;
767 struct commit
*commit
;
768 struct author_date_slab author_date
;
774 init_indegree_slab(&indegree
);
775 memset(&queue
, '\0', sizeof(queue
));
777 switch (sort_order
) {
778 default: /* REV_SORT_IN_GRAPH_ORDER */
779 queue
.compare
= NULL
;
781 case REV_SORT_BY_COMMIT_DATE
:
782 queue
.compare
= compare_commits_by_commit_date
;
784 case REV_SORT_BY_AUTHOR_DATE
:
785 init_author_date_slab(&author_date
);
786 queue
.compare
= compare_commits_by_author_date
;
787 queue
.cb_data
= &author_date
;
791 /* Mark them and clear the indegree */
792 for (next
= orig
; next
; next
= next
->next
) {
793 struct commit
*commit
= next
->item
;
794 *(indegree_slab_at(&indegree
, commit
)) = 1;
795 /* also record the author dates, if needed */
796 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
797 record_author_date(&author_date
, commit
);
800 /* update the indegree */
801 for (next
= orig
; next
; next
= next
->next
) {
802 struct commit_list
*parents
= next
->item
->parents
;
804 struct commit
*parent
= parents
->item
;
805 int *pi
= indegree_slab_at(&indegree
, parent
);
809 parents
= parents
->next
;
816 * tips are nodes not reachable from any other node in the list
818 * the tips serve as a starting set for the work queue.
820 for (next
= orig
; next
; next
= next
->next
) {
821 struct commit
*commit
= next
->item
;
823 if (*(indegree_slab_at(&indegree
, commit
)) == 1)
824 prio_queue_put(&queue
, commit
);
828 * This is unfortunate; the initial tips need to be shown
829 * in the order given from the revision traversal machinery.
831 if (sort_order
== REV_SORT_IN_GRAPH_ORDER
)
832 prio_queue_reverse(&queue
);
834 /* We no longer need the commit list */
835 free_commit_list(orig
);
839 while ((commit
= prio_queue_get(&queue
)) != NULL
) {
840 struct commit_list
*parents
;
842 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
843 struct commit
*parent
= parents
->item
;
844 int *pi
= indegree_slab_at(&indegree
, parent
);
850 * parents are only enqueued for emission
851 * when all their children have been emitted thereby
852 * guaranteeing topological order.
855 prio_queue_put(&queue
, parent
);
858 * all children of commit have already been
859 * emitted. we can emit it now.
861 *(indegree_slab_at(&indegree
, commit
)) = 0;
863 pptr
= &commit_list_insert(commit
, pptr
)->next
;
866 clear_indegree_slab(&indegree
);
867 clear_prio_queue(&queue
);
868 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
869 clear_author_date_slab(&author_date
);
873 struct commit
**commit
;
876 unsigned int initial
: 1;
879 static void add_one_commit(struct object_id
*oid
, struct rev_collect
*revs
)
881 struct commit
*commit
;
883 if (is_null_oid(oid
))
886 commit
= lookup_commit(the_repository
, oid
);
888 (commit
->object
.flags
& TMP_MARK
) ||
889 parse_commit(commit
))
892 ALLOC_GROW(revs
->commit
, revs
->nr
+ 1, revs
->alloc
);
893 revs
->commit
[revs
->nr
++] = commit
;
894 commit
->object
.flags
|= TMP_MARK
;
897 static int collect_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
898 const char *ident
, timestamp_t timestamp
,
899 int tz
, const char *message
, void *cbdata
)
901 struct rev_collect
*revs
= cbdata
;
905 add_one_commit(ooid
, revs
);
907 add_one_commit(noid
, revs
);
911 struct commit
*get_fork_point(const char *refname
, struct commit
*commit
)
913 struct object_id oid
;
914 struct rev_collect revs
;
915 struct commit_list
*bases
;
917 struct commit
*ret
= NULL
;
919 memset(&revs
, 0, sizeof(revs
));
921 for_each_reflog_ent(refname
, collect_one_reflog_ent
, &revs
);
923 if (!revs
.nr
&& !get_oid(refname
, &oid
))
924 add_one_commit(&oid
, &revs
);
926 for (i
= 0; i
< revs
.nr
; i
++)
927 revs
.commit
[i
]->object
.flags
&= ~TMP_MARK
;
929 bases
= get_merge_bases_many(commit
, revs
.nr
, revs
.commit
);
932 * There should be one and only one merge base, when we found
933 * a common ancestor among reflog entries.
935 if (!bases
|| bases
->next
)
938 /* And the found one must be one of the reflog entries */
939 for (i
= 0; i
< revs
.nr
; i
++)
940 if (&bases
->item
->object
== &revs
.commit
[i
]->object
)
948 free_commit_list(bases
);
952 static const char gpg_sig_header
[] = "gpgsig";
953 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
955 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
957 struct strbuf sig
= STRBUF_INIT
;
961 /* find the end of the header */
962 eoh
= strstr(buf
->buf
, "\n\n");
966 inspos
= eoh
- buf
->buf
+ 1;
968 if (!keyid
|| !*keyid
)
969 keyid
= get_signing_key();
970 if (sign_buffer(buf
, &sig
, keyid
)) {
971 strbuf_release(&sig
);
975 for (copypos
= 0; sig
.buf
[copypos
]; ) {
976 const char *bol
= sig
.buf
+ copypos
;
977 const char *eol
= strchrnul(bol
, '\n');
978 int len
= (eol
- bol
) + !!*eol
;
981 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
982 inspos
+= gpg_sig_header_len
;
984 strbuf_insertstr(buf
, inspos
++, " ");
985 strbuf_insert(buf
, inspos
, bol
, len
);
989 strbuf_release(&sig
);
993 int parse_signed_commit(const struct commit
*commit
,
994 struct strbuf
*payload
, struct strbuf
*signature
)
998 const char *buffer
= get_commit_buffer(commit
, &size
);
999 int in_signature
, saw_signature
= -1;
1000 const char *line
, *tail
;
1003 tail
= buffer
+ size
;
1006 while (line
< tail
) {
1007 const char *sig
= NULL
;
1008 const char *next
= memchr(line
, '\n', tail
- line
);
1010 next
= next
? next
+ 1 : tail
;
1011 if (in_signature
&& line
[0] == ' ')
1013 else if (starts_with(line
, gpg_sig_header
) &&
1014 line
[gpg_sig_header_len
] == ' ')
1015 sig
= line
+ gpg_sig_header_len
+ 1;
1017 strbuf_add(signature
, sig
, next
- sig
);
1022 /* dump the whole remainder of the buffer */
1024 strbuf_add(payload
, line
, next
- line
);
1029 unuse_commit_buffer(commit
, buffer
);
1030 return saw_signature
;
1033 int remove_signature(struct strbuf
*buf
)
1035 const char *line
= buf
->buf
;
1036 const char *tail
= buf
->buf
+ buf
->len
;
1037 int in_signature
= 0;
1038 const char *sig_start
= NULL
;
1039 const char *sig_end
= NULL
;
1041 while (line
< tail
) {
1042 const char *next
= memchr(line
, '\n', tail
- line
);
1043 next
= next
? next
+ 1 : tail
;
1045 if (in_signature
&& line
[0] == ' ')
1047 else if (starts_with(line
, gpg_sig_header
) &&
1048 line
[gpg_sig_header_len
] == ' ') {
1054 /* dump the whole remainder of the buffer */
1062 strbuf_remove(buf
, sig_start
- buf
->buf
, sig_end
- sig_start
);
1064 return sig_start
!= NULL
;
1067 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
1069 struct merge_remote_desc
*desc
;
1070 struct commit_extra_header
*mergetag
;
1072 unsigned long size
, len
;
1073 enum object_type type
;
1075 desc
= merge_remote_util(parent
);
1076 if (!desc
|| !desc
->obj
)
1078 buf
= read_object_file(&desc
->obj
->oid
, &type
, &size
);
1079 if (!buf
|| type
!= OBJ_TAG
)
1081 len
= parse_signature(buf
, size
);
1085 * We could verify this signature and either omit the tag when
1086 * it does not validate, but the integrator may not have the
1087 * public key of the signer of the tag he is merging, while a
1088 * later auditor may have it while auditing, so let's not run
1089 * verify-signed-buffer here for now...
1091 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1092 * warn("warning: signed tag unverified.");
1094 mergetag
= xcalloc(1, sizeof(*mergetag
));
1095 mergetag
->key
= xstrdup("mergetag");
1096 mergetag
->value
= buf
;
1097 mergetag
->len
= size
;
1100 *tail
= &mergetag
->next
;
1107 int check_commit_signature(const struct commit
*commit
, struct signature_check
*sigc
)
1109 struct strbuf payload
= STRBUF_INIT
;
1110 struct strbuf signature
= STRBUF_INIT
;
1115 if (parse_signed_commit(commit
, &payload
, &signature
) <= 0)
1117 ret
= check_signature(payload
.buf
, payload
.len
, signature
.buf
,
1118 signature
.len
, sigc
);
1121 strbuf_release(&payload
);
1122 strbuf_release(&signature
);
1127 void verify_merge_signature(struct commit
*commit
, int verbosity
,
1130 char hex
[GIT_MAX_HEXSZ
+ 1];
1131 struct signature_check signature_check
;
1133 memset(&signature_check
, 0, sizeof(signature_check
));
1135 ret
= check_commit_signature(commit
, &signature_check
);
1137 find_unique_abbrev_r(hex
, &commit
->object
.oid
, DEFAULT_ABBREV
);
1138 switch (signature_check
.result
) {
1140 if (ret
|| (check_trust
&& signature_check
.trust_level
< TRUST_MARGINAL
))
1141 die(_("Commit %s has an untrusted GPG signature, "
1142 "allegedly by %s."), hex
, signature_check
.signer
);
1145 die(_("Commit %s has a bad GPG signature "
1146 "allegedly by %s."), hex
, signature_check
.signer
);
1148 die(_("Commit %s does not have a GPG signature."), hex
);
1150 if (verbosity
>= 0 && signature_check
.result
== 'G')
1151 printf(_("Commit %s has a good GPG signature by %s\n"),
1152 hex
, signature_check
.signer
);
1154 signature_check_clear(&signature_check
);
1157 void append_merge_tag_headers(struct commit_list
*parents
,
1158 struct commit_extra_header
***tail
)
1161 struct commit
*parent
= parents
->item
;
1162 handle_signed_tag(parent
, tail
);
1163 parents
= parents
->next
;
1167 static void add_extra_header(struct strbuf
*buffer
,
1168 struct commit_extra_header
*extra
)
1170 strbuf_addstr(buffer
, extra
->key
);
1172 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1174 strbuf_addch(buffer
, '\n');
1177 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1178 const char **exclude
)
1180 struct commit_extra_header
*extra
= NULL
;
1182 const char *buffer
= get_commit_buffer(commit
, &size
);
1183 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1184 unuse_commit_buffer(commit
, buffer
);
1188 int for_each_mergetag(each_mergetag_fn fn
, struct commit
*commit
, void *data
)
1190 struct commit_extra_header
*extra
, *to_free
;
1193 to_free
= read_commit_extra_headers(commit
, NULL
);
1194 for (extra
= to_free
; !res
&& extra
; extra
= extra
->next
) {
1195 if (strcmp(extra
->key
, "mergetag"))
1196 continue; /* not a merge tag */
1197 res
= fn(commit
, extra
, data
);
1199 free_commit_extra_headers(to_free
);
1203 static inline int standard_header_field(const char *field
, size_t len
)
1205 return ((len
== 4 && !memcmp(field
, "tree", 4)) ||
1206 (len
== 6 && !memcmp(field
, "parent", 6)) ||
1207 (len
== 6 && !memcmp(field
, "author", 6)) ||
1208 (len
== 9 && !memcmp(field
, "committer", 9)) ||
1209 (len
== 8 && !memcmp(field
, "encoding", 8)));
1212 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1218 size_t xlen
= strlen(*exclude
);
1219 if (len
== xlen
&& !memcmp(field
, *exclude
, xlen
))
1226 static struct commit_extra_header
*read_commit_extra_header_lines(
1227 const char *buffer
, size_t size
,
1228 const char **exclude
)
1230 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1231 const char *line
, *next
, *eof
, *eob
;
1232 struct strbuf buf
= STRBUF_INIT
;
1234 for (line
= buffer
, eob
= line
+ size
;
1235 line
< eob
&& *line
!= '\n';
1237 next
= memchr(line
, '\n', eob
- line
);
1238 next
= next
? next
+ 1 : eob
;
1242 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1246 it
->value
= strbuf_detach(&buf
, &it
->len
);
1250 eof
= memchr(line
, ' ', next
- line
);
1253 else if (standard_header_field(line
, eof
- line
) ||
1254 excluded_header_field(line
, eof
- line
, exclude
))
1257 it
= xcalloc(1, sizeof(*it
));
1258 it
->key
= xmemdupz(line
, eof
-line
);
1262 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1265 it
->value
= strbuf_detach(&buf
, &it
->len
);
1269 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1272 struct commit_extra_header
*next
= extra
->next
;
1280 int commit_tree(const char *msg
, size_t msg_len
, const struct object_id
*tree
,
1281 struct commit_list
*parents
, struct object_id
*ret
,
1282 const char *author
, const char *sign_commit
)
1284 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1287 append_merge_tag_headers(parents
, &tail
);
1288 result
= commit_tree_extended(msg
, msg_len
, tree
, parents
, ret
,
1289 author
, sign_commit
, extra
);
1290 free_commit_extra_headers(extra
);
1294 static int find_invalid_utf8(const char *buf
, int len
)
1297 static const unsigned int max_codepoint
[] = {
1298 0x7f, 0x7ff, 0xffff, 0x10ffff
1302 unsigned char c
= *buf
++;
1303 int bytes
, bad_offset
;
1304 unsigned int codepoint
;
1305 unsigned int min_val
, max_val
;
1310 /* Simple US-ASCII? No worries. */
1314 bad_offset
= offset
-1;
1317 * Count how many more high bits set: that's how
1318 * many more bytes this sequence should have.
1327 * Must be between 1 and 3 more bytes. Longer sequences result in
1328 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1330 if (bytes
< 1 || 3 < bytes
)
1333 /* Do we *have* that many bytes? */
1338 * Place the encoded bits at the bottom of the value and compute the
1341 codepoint
= (c
& 0x7f) >> bytes
;
1342 min_val
= max_codepoint
[bytes
-1] + 1;
1343 max_val
= max_codepoint
[bytes
];
1348 /* And verify that they are good continuation bytes */
1351 codepoint
|= *buf
& 0x3f;
1352 if ((*buf
++ & 0xc0) != 0x80)
1356 /* Reject codepoints that are out of range for the sequence length. */
1357 if (codepoint
< min_val
|| codepoint
> max_val
)
1359 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1360 if ((codepoint
& 0x1ff800) == 0xd800)
1362 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1363 if ((codepoint
& 0xfffe) == 0xfffe)
1365 /* So are anything in the range U+FDD0..U+FDEF. */
1366 if (codepoint
>= 0xfdd0 && codepoint
<= 0xfdef)
1373 * This verifies that the buffer is in proper utf8 format.
1375 * If it isn't, it assumes any non-utf8 characters are Latin1,
1376 * and does the conversion.
1378 static int verify_utf8(struct strbuf
*buf
)
1386 unsigned char replace
[2];
1388 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1394 strbuf_remove(buf
, pos
, 1);
1396 /* We know 'c' must be in the range 128-255 */
1397 replace
[0] = 0xc0 + (c
>> 6);
1398 replace
[1] = 0x80 + (c
& 0x3f);
1399 strbuf_insert(buf
, pos
, replace
, 2);
1404 static const char commit_utf8_warn
[] =
1405 N_("Warning: commit message did not conform to UTF-8.\n"
1406 "You may want to amend it after fixing the message, or set the config\n"
1407 "variable i18n.commitencoding to the encoding your project uses.\n");
1409 int commit_tree_extended(const char *msg
, size_t msg_len
,
1410 const struct object_id
*tree
,
1411 struct commit_list
*parents
, struct object_id
*ret
,
1412 const char *author
, const char *sign_commit
,
1413 struct commit_extra_header
*extra
)
1416 int encoding_is_utf8
;
1417 struct strbuf buffer
;
1419 assert_oid_type(tree
, OBJ_TREE
);
1421 if (memchr(msg
, '\0', msg_len
))
1422 return error("a NUL byte in commit log message not allowed.");
1424 /* Not having i18n.commitencoding is the same as having utf-8 */
1425 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1427 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1428 strbuf_addf(&buffer
, "tree %s\n", oid_to_hex(tree
));
1431 * NOTE! This ordering means that the same exact tree merged with a
1432 * different order of parents will be a _different_ changeset even
1433 * if everything else stays the same.
1436 struct commit
*parent
= pop_commit(&parents
);
1437 strbuf_addf(&buffer
, "parent %s\n",
1438 oid_to_hex(&parent
->object
.oid
));
1441 /* Person/date information */
1443 author
= git_author_info(IDENT_STRICT
);
1444 strbuf_addf(&buffer
, "author %s\n", author
);
1445 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_STRICT
));
1446 if (!encoding_is_utf8
)
1447 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1450 add_extra_header(&buffer
, extra
);
1451 extra
= extra
->next
;
1453 strbuf_addch(&buffer
, '\n');
1455 /* And add the comment */
1456 strbuf_add(&buffer
, msg
, msg_len
);
1458 /* And check the encoding */
1459 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1460 fprintf(stderr
, _(commit_utf8_warn
));
1462 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
)) {
1467 result
= write_object_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1469 strbuf_release(&buffer
);
1473 define_commit_slab(merge_desc_slab
, struct merge_remote_desc
*);
1474 static struct merge_desc_slab merge_desc_slab
= COMMIT_SLAB_INIT(1, merge_desc_slab
);
1476 struct merge_remote_desc
*merge_remote_util(struct commit
*commit
)
1478 return *merge_desc_slab_at(&merge_desc_slab
, commit
);
1481 void set_merge_remote_desc(struct commit
*commit
,
1482 const char *name
, struct object
*obj
)
1484 struct merge_remote_desc
*desc
;
1485 FLEX_ALLOC_STR(desc
, name
, name
);
1487 *merge_desc_slab_at(&merge_desc_slab
, commit
) = desc
;
1490 struct commit
*get_merge_parent(const char *name
)
1493 struct commit
*commit
;
1494 struct object_id oid
;
1495 if (get_oid(name
, &oid
))
1497 obj
= parse_object(the_repository
, &oid
);
1498 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1499 if (commit
&& !merge_remote_util(commit
))
1500 set_merge_remote_desc(commit
, name
, obj
);
1505 * Append a commit to the end of the commit_list.
1507 * next starts by pointing to the variable that holds the head of an
1508 * empty commit_list, and is updated to point to the "next" field of
1509 * the last item on the list as new commits are appended.
1513 * struct commit_list *list;
1514 * struct commit_list **next = &list;
1516 * next = commit_list_append(c1, next);
1517 * next = commit_list_append(c2, next);
1518 * assert(commit_list_count(list) == 2);
1521 struct commit_list
**commit_list_append(struct commit
*commit
,
1522 struct commit_list
**next
)
1524 struct commit_list
*new_commit
= xmalloc(sizeof(struct commit_list
));
1525 new_commit
->item
= commit
;
1527 new_commit
->next
= NULL
;
1528 return &new_commit
->next
;
1531 const char *find_commit_header(const char *msg
, const char *key
, size_t *out_len
)
1533 int key_len
= strlen(key
);
1534 const char *line
= msg
;
1537 const char *eol
= strchrnul(line
, '\n');
1542 if (eol
- line
> key_len
&&
1543 !strncmp(line
, key
, key_len
) &&
1544 line
[key_len
] == ' ') {
1545 *out_len
= eol
- line
- key_len
- 1;
1546 return line
+ key_len
+ 1;
1548 line
= *eol
? eol
+ 1 : NULL
;
1554 * Inspect the given string and determine the true "end" of the log message, in
1555 * order to find where to put a new Signed-off-by: line. Ignored are
1556 * trailing comment lines and blank lines. To support "git commit -s
1557 * --amend" on an existing commit, we also ignore "Conflicts:". To
1558 * support "git commit -v", we truncate at cut lines.
1560 * Returns the number of bytes from the tail to ignore, to be fed as
1561 * the second parameter to append_signoff().
1563 size_t ignore_non_trailer(const char *buf
, size_t len
)
1567 int in_old_conflicts_block
= 0;
1568 size_t cutoff
= wt_status_locate_end(buf
, len
);
1570 while (bol
< cutoff
) {
1571 const char *next_line
= memchr(buf
+ bol
, '\n', len
- bol
);
1574 next_line
= buf
+ len
;
1578 if (buf
[bol
] == comment_line_char
|| buf
[bol
] == '\n') {
1579 /* is this the first of the run of comments? */
1582 /* otherwise, it is just continuing */
1583 } else if (starts_with(buf
+ bol
, "Conflicts:\n")) {
1584 in_old_conflicts_block
= 1;
1587 } else if (in_old_conflicts_block
&& buf
[bol
] == '\t') {
1588 ; /* a pathname in the conflicts block */
1590 /* the previous was not trailing comment */
1592 in_old_conflicts_block
= 0;
1594 bol
= next_line
- buf
;
1596 return boc
? len
- boc
: len
- cutoff
;
1599 int run_commit_hook(int editor_is_used
, const char *index_file
,
1600 const char *name
, ...)
1602 struct argv_array hook_env
= ARGV_ARRAY_INIT
;
1606 argv_array_pushf(&hook_env
, "GIT_INDEX_FILE=%s", index_file
);
1609 * Let the hook know that no editor will be launched.
1611 if (!editor_is_used
)
1612 argv_array_push(&hook_env
, "GIT_EDITOR=:");
1614 va_start(args
, name
);
1615 ret
= run_hook_ve(hook_env
.argv
,name
, args
);
1617 argv_array_clear(&hook_env
);