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 "hash-lookup.h"
18 #include "wt-status.h"
21 #include "commit-reach.h"
22 #include "run-command.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
,
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
);
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
));
62 struct commit
*lookup_commit(struct repository
*r
, const struct object_id
*oid
)
64 struct object
*obj
= lookup_object(r
, oid
);
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
)
73 struct commit
*commit
;
75 if (get_oid_committish(name
, &oid
))
77 commit
= lookup_commit_reference(the_repository
, &oid
);
78 if (parse_commit(commit
))
83 static timestamp_t
parse_commit_date(const char *buf
, const char *tail
)
89 if (memcmp(buf
, "author", 6))
91 while (buf
< tail
&& *buf
++ != '\n')
95 if (memcmp(buf
, "committer", 9))
97 while (buf
< tail
&& *buf
++ != '>')
102 while (buf
< tail
&& *buf
++ != '\n')
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
)
129 free_commit_list(c
->parents
);
131 c
->object
.parsed
= 0;
134 int register_commit_graft(struct repository
*r
, struct commit_graft
*graft
,
137 int pos
= commit_graft_pos(r
, &graft
->oid
);
143 free(r
->parsed_objects
->grafts
[pos
]);
144 r
->parsed_objects
->grafts
[pos
] = graft
;
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
);
163 struct commit_graft
*read_graft_line(struct strbuf
*line
)
165 /* The format is just "Commit Parent1 Parent2 ...\n" */
167 const char *tail
= NULL
;
168 struct commit_graft
*graft
= NULL
;
169 struct object_id dummy_oid
, *oid
;
172 if (!line
->len
|| line
->buf
[0] == '#')
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
))
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
))
188 graft
= xmalloc(st_add(sizeof(*graft
),
189 st_mult(sizeof(struct object_id
), i
)));
190 graft
->nr_parent
= i
;
196 error("bad graft data: %s", line
->buf
);
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
;
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"
212 "Please use \"git replace --convert-graft-file\"\n"
213 "to convert the grafts into replace refs.\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
);
222 if (register_commit_graft(r
, graft
, 1))
223 error("duplicate graft data: %s", buf
.buf
);
226 strbuf_release(&buf
);
230 void prepare_commit_graft(struct repository
*r
)
234 if (r
->parsed_objects
->commit_graft_prepared
)
236 if (!startup_info
->have_repository
)
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
)
249 prepare_commit_graft(r
);
250 pos
= commit_graft_pos(r
, oid
);
253 return r
->parsed_objects
->grafts
[pos
];
256 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
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
);
264 void reset_commit_grafts(struct repository
*r
)
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
{
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
);
289 void free_commit_buffer_slab(struct buffer_slab
*bs
)
291 clear_buffer_slab(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
);
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
);
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
);
323 enum object_type type
;
325 ret
= repo_read_object_file(r
, &commit
->object
.oid
, &type
, &size
);
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
));
338 void repo_unuse_commit_buffer(struct repository
*r
,
339 const struct commit
*commit
,
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
);
353 FREE_AND_NULL(v
->buffer
);
358 static inline void set_commit_tree(struct commit
*c
, struct 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
);
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
);
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
);
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;
422 if (item
->object
.parsed
)
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
;
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
);
442 return error("bad tree pointer %s in commit %s",
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
);
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
))
466 new_parent
= lookup_commit(r
, &parent
);
468 return error("bad parent %s in commit %s",
470 oid_to_hex(&item
->object
.oid
));
471 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
475 struct commit
*new_parent
;
476 for (i
= 0; i
< graft
->nr_parent
; i
++) {
477 new_parent
= lookup_commit(r
,
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
);
489 load_commit_graph_info(r
, item
);
491 item
->object
.parsed
= 1;
495 int repo_parse_commit_internal(struct repository
*r
,
497 int quiet_on_missing
,
498 int use_commit_graph
)
500 enum object_type type
;
507 if (item
->object
.parsed
)
509 if (use_commit_graph
&& parse_commit_in_graph(r
, item
))
511 buffer
= repo_read_object_file(r
, &item
->object
.oid
, &type
, &size
);
513 return quiet_on_missing
? -1 :
514 error("Could not read %s",
515 oid_to_hex(&item
->object
.oid
));
516 if (type
!= OBJ_COMMIT
) {
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
);
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
)
547 const char *p
= commit_buffer
;
549 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
552 p
= skip_blank_lines(p
+ 2);
553 eol
= strchrnul(p
, '\n');
562 size_t commit_subject_length(const char *body
)
564 const char *p
= body
;
566 const char *next
= skip_blank_lines(p
);
569 p
= strchrnul(p
, '\n');
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
;
585 int commit_list_contains(struct commit
*item
, struct commit_list
*list
)
588 if (list
->item
== item
)
596 unsigned commit_list_count(const struct commit_list
*l
)
599 for (; l
; l
= l
->next
)
604 struct commit_list
*copy_commit_list(struct commit_list
*list
)
606 struct commit_list
*head
= NULL
;
607 struct commit_list
**pp
= &head
;
609 pp
= commit_list_append(list
->item
, pp
);
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
;
626 void free_commit_list(struct commit_list
*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
) {
642 return commit_list_insert(item
, pp
);
645 static int commit_list_compare_by_date(const void *a
, const void *b
)
647 timestamp_t a_date
= ((const struct commit_list
*)a
)->item
->date
;
648 timestamp_t b_date
= ((const struct commit_list
*)b
)->item
->date
;
656 static void *commit_list_get_next(const void *a
)
658 return ((const struct commit_list
*)a
)->next
;
661 static void commit_list_set_next(void *a
, void *next
)
663 ((struct commit_list
*)a
)->next
= next
;
666 void commit_list_sort_by_date(struct commit_list
**list
)
668 *list
= llist_mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
669 commit_list_compare_by_date
);
672 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
675 struct commit
*ret
= pop_commit(list
);
676 struct commit_list
*parents
= ret
->parents
;
679 struct commit
*commit
= parents
->item
;
680 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
681 commit
->object
.flags
|= mark
;
682 commit_list_insert_by_date(commit
, list
);
684 parents
= parents
->next
;
689 static void clear_commit_marks_1(struct commit_list
**plist
,
690 struct commit
*commit
, unsigned int mark
)
693 struct commit_list
*parents
;
695 if (!(mark
& commit
->object
.flags
))
698 commit
->object
.flags
&= ~mark
;
700 parents
= commit
->parents
;
704 while ((parents
= parents
->next
))
705 commit_list_insert(parents
->item
, plist
);
707 commit
= commit
->parents
->item
;
711 void clear_commit_marks_many(int nr
, struct commit
**commit
, unsigned int mark
)
713 struct commit_list
*list
= NULL
;
716 clear_commit_marks_1(&list
, *commit
, mark
);
720 clear_commit_marks_1(&list
, pop_commit(&list
), mark
);
723 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
725 clear_commit_marks_many(1, &commit
, mark
);
728 struct commit
*pop_commit(struct commit_list
**stack
)
730 struct commit_list
*top
= *stack
;
731 struct commit
*item
= top
? top
->item
: NULL
;
741 * Topological sort support
744 /* count number of children that have not been emitted */
745 define_commit_slab(indegree_slab
, int);
747 define_commit_slab(author_date_slab
, timestamp_t
);
749 void record_author_date(struct author_date_slab
*author_date
,
750 struct commit
*commit
)
752 const char *buffer
= get_commit_buffer(commit
, NULL
);
753 struct ident_split ident
;
754 const char *ident_line
;
759 ident_line
= find_commit_header(buffer
, "author", &ident_len
);
761 goto fail_exit
; /* no author line */
762 if (split_ident_line(&ident
, ident_line
, ident_len
) ||
763 !ident
.date_begin
|| !ident
.date_end
)
764 goto fail_exit
; /* malformed "author" line */
766 date
= parse_timestamp(ident
.date_begin
, &date_end
, 10);
767 if (date_end
!= ident
.date_end
)
768 goto fail_exit
; /* malformed date */
769 *(author_date_slab_at(author_date
, commit
)) = date
;
772 unuse_commit_buffer(commit
, buffer
);
775 int compare_commits_by_author_date(const void *a_
, const void *b_
,
778 const struct commit
*a
= a_
, *b
= b_
;
779 struct author_date_slab
*author_date
= cb_data
;
780 timestamp_t a_date
= *(author_date_slab_at(author_date
, a
));
781 timestamp_t b_date
= *(author_date_slab_at(author_date
, b
));
783 /* newer commits with larger date first */
786 else if (a_date
> b_date
)
791 int compare_commits_by_gen_then_commit_date(const void *a_
, const void *b_
, void *unused
)
793 const struct commit
*a
= a_
, *b
= b_
;
794 const timestamp_t generation_a
= commit_graph_generation(a
),
795 generation_b
= commit_graph_generation(b
);
797 /* newer commits first */
798 if (generation_a
< generation_b
)
800 else if (generation_a
> generation_b
)
803 /* use date as a heuristic when generations are equal */
804 if (a
->date
< b
->date
)
806 else if (a
->date
> b
->date
)
811 int compare_commits_by_commit_date(const void *a_
, const void *b_
, void *unused
)
813 const struct commit
*a
= a_
, *b
= b_
;
814 /* newer commits with larger date first */
815 if (a
->date
< b
->date
)
817 else if (a
->date
> b
->date
)
823 * Performs an in-place topological sort on the list supplied.
825 void sort_in_topological_order(struct commit_list
**list
, enum rev_sort_order sort_order
)
827 struct commit_list
*next
, *orig
= *list
;
828 struct commit_list
**pptr
;
829 struct indegree_slab indegree
;
830 struct prio_queue queue
;
831 struct commit
*commit
;
832 struct author_date_slab author_date
;
838 init_indegree_slab(&indegree
);
839 memset(&queue
, '\0', sizeof(queue
));
841 switch (sort_order
) {
842 default: /* REV_SORT_IN_GRAPH_ORDER */
843 queue
.compare
= NULL
;
845 case REV_SORT_BY_COMMIT_DATE
:
846 queue
.compare
= compare_commits_by_commit_date
;
848 case REV_SORT_BY_AUTHOR_DATE
:
849 init_author_date_slab(&author_date
);
850 queue
.compare
= compare_commits_by_author_date
;
851 queue
.cb_data
= &author_date
;
855 /* Mark them and clear the indegree */
856 for (next
= orig
; next
; next
= next
->next
) {
857 struct commit
*commit
= next
->item
;
858 *(indegree_slab_at(&indegree
, commit
)) = 1;
859 /* also record the author dates, if needed */
860 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
861 record_author_date(&author_date
, commit
);
864 /* update the indegree */
865 for (next
= orig
; next
; next
= next
->next
) {
866 struct commit_list
*parents
= next
->item
->parents
;
868 struct commit
*parent
= parents
->item
;
869 int *pi
= indegree_slab_at(&indegree
, parent
);
873 parents
= parents
->next
;
880 * tips are nodes not reachable from any other node in the list
882 * the tips serve as a starting set for the work queue.
884 for (next
= orig
; next
; next
= next
->next
) {
885 struct commit
*commit
= next
->item
;
887 if (*(indegree_slab_at(&indegree
, commit
)) == 1)
888 prio_queue_put(&queue
, commit
);
892 * This is unfortunate; the initial tips need to be shown
893 * in the order given from the revision traversal machinery.
895 if (sort_order
== REV_SORT_IN_GRAPH_ORDER
)
896 prio_queue_reverse(&queue
);
898 /* We no longer need the commit list */
899 free_commit_list(orig
);
903 while ((commit
= prio_queue_get(&queue
)) != NULL
) {
904 struct commit_list
*parents
;
906 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
907 struct commit
*parent
= parents
->item
;
908 int *pi
= indegree_slab_at(&indegree
, parent
);
914 * parents are only enqueued for emission
915 * when all their children have been emitted thereby
916 * guaranteeing topological order.
919 prio_queue_put(&queue
, parent
);
922 * all children of commit have already been
923 * emitted. we can emit it now.
925 *(indegree_slab_at(&indegree
, commit
)) = 0;
927 pptr
= &commit_list_insert(commit
, pptr
)->next
;
930 clear_indegree_slab(&indegree
);
931 clear_prio_queue(&queue
);
932 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
933 clear_author_date_slab(&author_date
);
937 struct commit
**commit
;
940 unsigned int initial
: 1;
943 static void add_one_commit(struct object_id
*oid
, struct rev_collect
*revs
)
945 struct commit
*commit
;
947 if (is_null_oid(oid
))
950 commit
= lookup_commit(the_repository
, oid
);
952 (commit
->object
.flags
& TMP_MARK
) ||
953 parse_commit(commit
))
956 ALLOC_GROW(revs
->commit
, revs
->nr
+ 1, revs
->alloc
);
957 revs
->commit
[revs
->nr
++] = commit
;
958 commit
->object
.flags
|= TMP_MARK
;
961 static int collect_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
962 const char *ident
, timestamp_t timestamp
,
963 int tz
, const char *message
, void *cbdata
)
965 struct rev_collect
*revs
= cbdata
;
969 add_one_commit(ooid
, revs
);
971 add_one_commit(noid
, revs
);
975 struct commit
*get_fork_point(const char *refname
, struct commit
*commit
)
977 struct object_id oid
;
978 struct rev_collect revs
;
979 struct commit_list
*bases
;
981 struct commit
*ret
= NULL
;
984 switch (dwim_ref(refname
, strlen(refname
), &oid
, &full_refname
, 0)) {
986 die("No such ref: '%s'", refname
);
990 die("Ambiguous refname: '%s'", refname
);
993 memset(&revs
, 0, sizeof(revs
));
995 for_each_reflog_ent(full_refname
, collect_one_reflog_ent
, &revs
);
998 add_one_commit(&oid
, &revs
);
1000 for (i
= 0; i
< revs
.nr
; i
++)
1001 revs
.commit
[i
]->object
.flags
&= ~TMP_MARK
;
1003 bases
= get_merge_bases_many(commit
, revs
.nr
, revs
.commit
);
1006 * There should be one and only one merge base, when we found
1007 * a common ancestor among reflog entries.
1009 if (!bases
|| bases
->next
)
1010 goto cleanup_return
;
1012 /* And the found one must be one of the reflog entries */
1013 for (i
= 0; i
< revs
.nr
; i
++)
1014 if (&bases
->item
->object
== &revs
.commit
[i
]->object
)
1017 goto cleanup_return
;
1022 free_commit_list(bases
);
1028 * Indexed by hash algorithm identifier.
1030 static const char *gpg_sig_headers
[] = {
1036 int sign_with_header(struct strbuf
*buf
, const char *keyid
)
1038 struct strbuf sig
= STRBUF_INIT
;
1039 int inspos
, copypos
;
1041 const char *gpg_sig_header
= gpg_sig_headers
[hash_algo_by_ptr(the_hash_algo
)];
1042 int gpg_sig_header_len
= strlen(gpg_sig_header
);
1044 /* find the end of the header */
1045 eoh
= strstr(buf
->buf
, "\n\n");
1049 inspos
= eoh
- buf
->buf
+ 1;
1051 if (!keyid
|| !*keyid
)
1052 keyid
= get_signing_key();
1053 if (sign_buffer(buf
, &sig
, keyid
)) {
1054 strbuf_release(&sig
);
1058 for (copypos
= 0; sig
.buf
[copypos
]; ) {
1059 const char *bol
= sig
.buf
+ copypos
;
1060 const char *eol
= strchrnul(bol
, '\n');
1061 int len
= (eol
- bol
) + !!*eol
;
1064 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
1065 inspos
+= gpg_sig_header_len
;
1067 strbuf_insertstr(buf
, inspos
++, " ");
1068 strbuf_insert(buf
, inspos
, bol
, len
);
1072 strbuf_release(&sig
);
1078 int parse_signed_commit(const struct commit
*commit
,
1079 struct strbuf
*payload
, struct strbuf
*signature
,
1080 const struct git_hash_algo
*algop
)
1083 const char *buffer
= get_commit_buffer(commit
, &size
);
1084 int ret
= parse_buffer_signed_by_header(buffer
, size
, payload
, signature
, algop
);
1086 unuse_commit_buffer(commit
, buffer
);
1090 int parse_buffer_signed_by_header(const char *buffer
,
1092 struct strbuf
*payload
,
1093 struct strbuf
*signature
,
1094 const struct git_hash_algo
*algop
)
1096 int in_signature
= 0, saw_signature
= 0, other_signature
= 0;
1097 const char *line
, *tail
, *p
;
1098 const char *gpg_sig_header
= gpg_sig_headers
[hash_algo_by_ptr(algop
)];
1101 tail
= buffer
+ size
;
1102 while (line
< tail
) {
1103 const char *sig
= NULL
;
1104 const char *next
= memchr(line
, '\n', tail
- line
);
1106 next
= next
? next
+ 1 : tail
;
1107 if (in_signature
&& line
[0] == ' ')
1109 else if (skip_prefix(line
, gpg_sig_header
, &p
) &&
1111 sig
= line
+ strlen(gpg_sig_header
) + 1;
1112 other_signature
= 0;
1114 else if (starts_with(line
, "gpgsig"))
1115 other_signature
= 1;
1116 else if (other_signature
&& line
[0] != ' ')
1117 other_signature
= 0;
1119 strbuf_add(signature
, sig
, next
- sig
);
1124 /* dump the whole remainder of the buffer */
1126 if (!other_signature
)
1127 strbuf_add(payload
, line
, next
- line
);
1132 return saw_signature
;
1135 int remove_signature(struct strbuf
*buf
)
1137 const char *line
= buf
->buf
;
1138 const char *tail
= buf
->buf
+ buf
->len
;
1139 int in_signature
= 0;
1143 } sigs
[2], *sigp
= &sigs
[0];
1145 const char *orig_buf
= buf
->buf
;
1147 memset(sigs
, 0, sizeof(sigs
));
1149 while (line
< tail
) {
1150 const char *next
= memchr(line
, '\n', tail
- line
);
1151 next
= next
? next
+ 1 : tail
;
1153 if (in_signature
&& line
[0] == ' ')
1155 else if (starts_with(line
, "gpgsig")) {
1157 for (i
= 1; i
< GIT_HASH_NALGOS
; i
++) {
1159 if (skip_prefix(line
, gpg_sig_headers
[i
], &p
) &&
1168 /* dump the whole remainder of the buffer */
1170 if (in_signature
&& sigp
- sigs
!= ARRAY_SIZE(sigs
))
1177 for (i
= ARRAY_SIZE(sigs
) - 1; i
>= 0; i
--)
1179 strbuf_remove(buf
, sigs
[i
].start
- orig_buf
, sigs
[i
].end
- sigs
[i
].start
);
1181 return sigs
[0].start
!= NULL
;
1184 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
1186 struct merge_remote_desc
*desc
;
1187 struct commit_extra_header
*mergetag
;
1190 enum object_type type
;
1191 struct strbuf payload
= STRBUF_INIT
;
1192 struct strbuf signature
= STRBUF_INIT
;
1194 desc
= merge_remote_util(parent
);
1195 if (!desc
|| !desc
->obj
)
1197 buf
= read_object_file(&desc
->obj
->oid
, &type
, &size
);
1198 if (!buf
|| type
!= OBJ_TAG
)
1200 if (!parse_signature(buf
, size
, &payload
, &signature
))
1203 * We could verify this signature and either omit the tag when
1204 * it does not validate, but the integrator may not have the
1205 * public key of the signer of the tag being merged, while a
1206 * later auditor may have it while auditing, so let's not run
1207 * verify-signed-buffer here for now...
1209 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1210 * warn("warning: signed tag unverified.");
1212 CALLOC_ARRAY(mergetag
, 1);
1213 mergetag
->key
= xstrdup("mergetag");
1214 mergetag
->value
= buf
;
1215 mergetag
->len
= size
;
1218 *tail
= &mergetag
->next
;
1219 strbuf_release(&payload
);
1220 strbuf_release(&signature
);
1227 int check_commit_signature(const struct commit
*commit
, struct signature_check
*sigc
)
1229 struct strbuf payload
= STRBUF_INIT
;
1230 struct strbuf signature
= STRBUF_INIT
;
1235 if (parse_signed_commit(commit
, &payload
, &signature
, the_hash_algo
) <= 0)
1238 sigc
->payload_type
= SIGNATURE_PAYLOAD_COMMIT
;
1239 sigc
->payload
= strbuf_detach(&payload
, &sigc
->payload_len
);
1240 ret
= check_signature(sigc
, signature
.buf
, signature
.len
);
1243 strbuf_release(&payload
);
1244 strbuf_release(&signature
);
1249 void verify_merge_signature(struct commit
*commit
, int verbosity
,
1252 char hex
[GIT_MAX_HEXSZ
+ 1];
1253 struct signature_check signature_check
;
1255 memset(&signature_check
, 0, sizeof(signature_check
));
1257 ret
= check_commit_signature(commit
, &signature_check
);
1259 find_unique_abbrev_r(hex
, &commit
->object
.oid
, DEFAULT_ABBREV
);
1260 switch (signature_check
.result
) {
1262 if (ret
|| (check_trust
&& signature_check
.trust_level
< TRUST_MARGINAL
))
1263 die(_("Commit %s has an untrusted GPG signature, "
1264 "allegedly by %s."), hex
, signature_check
.signer
);
1267 die(_("Commit %s has a bad GPG signature "
1268 "allegedly by %s."), hex
, signature_check
.signer
);
1270 die(_("Commit %s does not have a GPG signature."), hex
);
1272 if (verbosity
>= 0 && signature_check
.result
== 'G')
1273 printf(_("Commit %s has a good GPG signature by %s\n"),
1274 hex
, signature_check
.signer
);
1276 signature_check_clear(&signature_check
);
1279 void append_merge_tag_headers(struct commit_list
*parents
,
1280 struct commit_extra_header
***tail
)
1283 struct commit
*parent
= parents
->item
;
1284 handle_signed_tag(parent
, tail
);
1285 parents
= parents
->next
;
1289 static void add_extra_header(struct strbuf
*buffer
,
1290 struct commit_extra_header
*extra
)
1292 strbuf_addstr(buffer
, extra
->key
);
1294 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1296 strbuf_addch(buffer
, '\n');
1299 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1300 const char **exclude
)
1302 struct commit_extra_header
*extra
= NULL
;
1304 const char *buffer
= get_commit_buffer(commit
, &size
);
1305 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1306 unuse_commit_buffer(commit
, buffer
);
1310 int for_each_mergetag(each_mergetag_fn fn
, struct commit
*commit
, void *data
)
1312 struct commit_extra_header
*extra
, *to_free
;
1315 to_free
= read_commit_extra_headers(commit
, NULL
);
1316 for (extra
= to_free
; !res
&& extra
; extra
= extra
->next
) {
1317 if (strcmp(extra
->key
, "mergetag"))
1318 continue; /* not a merge tag */
1319 res
= fn(commit
, extra
, data
);
1321 free_commit_extra_headers(to_free
);
1325 static inline int standard_header_field(const char *field
, size_t len
)
1327 return ((len
== 4 && !memcmp(field
, "tree", 4)) ||
1328 (len
== 6 && !memcmp(field
, "parent", 6)) ||
1329 (len
== 6 && !memcmp(field
, "author", 6)) ||
1330 (len
== 9 && !memcmp(field
, "committer", 9)) ||
1331 (len
== 8 && !memcmp(field
, "encoding", 8)));
1334 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1340 size_t xlen
= strlen(*exclude
);
1341 if (len
== xlen
&& !memcmp(field
, *exclude
, xlen
))
1348 static struct commit_extra_header
*read_commit_extra_header_lines(
1349 const char *buffer
, size_t size
,
1350 const char **exclude
)
1352 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1353 const char *line
, *next
, *eof
, *eob
;
1354 struct strbuf buf
= STRBUF_INIT
;
1356 for (line
= buffer
, eob
= line
+ size
;
1357 line
< eob
&& *line
!= '\n';
1359 next
= memchr(line
, '\n', eob
- line
);
1360 next
= next
? next
+ 1 : eob
;
1364 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1368 it
->value
= strbuf_detach(&buf
, &it
->len
);
1372 eof
= memchr(line
, ' ', next
- line
);
1375 else if (standard_header_field(line
, eof
- line
) ||
1376 excluded_header_field(line
, eof
- line
, exclude
))
1379 CALLOC_ARRAY(it
, 1);
1380 it
->key
= xmemdupz(line
, eof
-line
);
1384 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1387 it
->value
= strbuf_detach(&buf
, &it
->len
);
1391 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1394 struct commit_extra_header
*next
= extra
->next
;
1402 int commit_tree(const char *msg
, size_t msg_len
, const struct object_id
*tree
,
1403 struct commit_list
*parents
, struct object_id
*ret
,
1404 const char *author
, const char *sign_commit
)
1406 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1409 append_merge_tag_headers(parents
, &tail
);
1410 result
= commit_tree_extended(msg
, msg_len
, tree
, parents
, ret
, author
,
1411 NULL
, sign_commit
, extra
);
1412 free_commit_extra_headers(extra
);
1416 static int find_invalid_utf8(const char *buf
, int len
)
1419 static const unsigned int max_codepoint
[] = {
1420 0x7f, 0x7ff, 0xffff, 0x10ffff
1424 unsigned char c
= *buf
++;
1425 int bytes
, bad_offset
;
1426 unsigned int codepoint
;
1427 unsigned int min_val
, max_val
;
1432 /* Simple US-ASCII? No worries. */
1436 bad_offset
= offset
-1;
1439 * Count how many more high bits set: that's how
1440 * many more bytes this sequence should have.
1449 * Must be between 1 and 3 more bytes. Longer sequences result in
1450 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1452 if (bytes
< 1 || 3 < bytes
)
1455 /* Do we *have* that many bytes? */
1460 * Place the encoded bits at the bottom of the value and compute the
1463 codepoint
= (c
& 0x7f) >> bytes
;
1464 min_val
= max_codepoint
[bytes
-1] + 1;
1465 max_val
= max_codepoint
[bytes
];
1470 /* And verify that they are good continuation bytes */
1473 codepoint
|= *buf
& 0x3f;
1474 if ((*buf
++ & 0xc0) != 0x80)
1478 /* Reject codepoints that are out of range for the sequence length. */
1479 if (codepoint
< min_val
|| codepoint
> max_val
)
1481 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1482 if ((codepoint
& 0x1ff800) == 0xd800)
1484 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1485 if ((codepoint
& 0xfffe) == 0xfffe)
1487 /* So are anything in the range U+FDD0..U+FDEF. */
1488 if (codepoint
>= 0xfdd0 && codepoint
<= 0xfdef)
1495 * This verifies that the buffer is in proper utf8 format.
1497 * If it isn't, it assumes any non-utf8 characters are Latin1,
1498 * and does the conversion.
1500 static int verify_utf8(struct strbuf
*buf
)
1508 unsigned char replace
[2];
1510 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1516 strbuf_remove(buf
, pos
, 1);
1518 /* We know 'c' must be in the range 128-255 */
1519 replace
[0] = 0xc0 + (c
>> 6);
1520 replace
[1] = 0x80 + (c
& 0x3f);
1521 strbuf_insert(buf
, pos
, replace
, 2);
1526 static const char commit_utf8_warn
[] =
1527 N_("Warning: commit message did not conform to UTF-8.\n"
1528 "You may want to amend it after fixing the message, or set the config\n"
1529 "variable i18n.commitencoding to the encoding your project uses.\n");
1531 int commit_tree_extended(const char *msg
, size_t msg_len
,
1532 const struct object_id
*tree
,
1533 struct commit_list
*parents
, struct object_id
*ret
,
1534 const char *author
, const char *committer
,
1535 const char *sign_commit
,
1536 struct commit_extra_header
*extra
)
1539 int encoding_is_utf8
;
1540 struct strbuf buffer
;
1542 assert_oid_type(tree
, OBJ_TREE
);
1544 if (memchr(msg
, '\0', msg_len
))
1545 return error("a NUL byte in commit log message not allowed.");
1547 /* Not having i18n.commitencoding is the same as having utf-8 */
1548 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1550 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1551 strbuf_addf(&buffer
, "tree %s\n", oid_to_hex(tree
));
1554 * NOTE! This ordering means that the same exact tree merged with a
1555 * different order of parents will be a _different_ changeset even
1556 * if everything else stays the same.
1559 struct commit
*parent
= pop_commit(&parents
);
1560 strbuf_addf(&buffer
, "parent %s\n",
1561 oid_to_hex(&parent
->object
.oid
));
1564 /* Person/date information */
1566 author
= git_author_info(IDENT_STRICT
);
1567 strbuf_addf(&buffer
, "author %s\n", author
);
1569 committer
= git_committer_info(IDENT_STRICT
);
1570 strbuf_addf(&buffer
, "committer %s\n", committer
);
1571 if (!encoding_is_utf8
)
1572 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1575 add_extra_header(&buffer
, extra
);
1576 extra
= extra
->next
;
1578 strbuf_addch(&buffer
, '\n');
1580 /* And add the comment */
1581 strbuf_add(&buffer
, msg
, msg_len
);
1583 /* And check the encoding */
1584 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1585 fprintf(stderr
, _(commit_utf8_warn
));
1587 if (sign_commit
&& sign_with_header(&buffer
, sign_commit
)) {
1592 result
= write_object_file(buffer
.buf
, buffer
.len
, OBJ_COMMIT
, ret
);
1594 strbuf_release(&buffer
);
1598 define_commit_slab(merge_desc_slab
, struct merge_remote_desc
*);
1599 static struct merge_desc_slab merge_desc_slab
= COMMIT_SLAB_INIT(1, merge_desc_slab
);
1601 struct merge_remote_desc
*merge_remote_util(struct commit
*commit
)
1603 return *merge_desc_slab_at(&merge_desc_slab
, commit
);
1606 void set_merge_remote_desc(struct commit
*commit
,
1607 const char *name
, struct object
*obj
)
1609 struct merge_remote_desc
*desc
;
1610 FLEX_ALLOC_STR(desc
, name
, name
);
1612 *merge_desc_slab_at(&merge_desc_slab
, commit
) = desc
;
1615 struct commit
*get_merge_parent(const char *name
)
1618 struct commit
*commit
;
1619 struct object_id oid
;
1620 if (get_oid(name
, &oid
))
1622 obj
= parse_object(the_repository
, &oid
);
1623 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1624 if (commit
&& !merge_remote_util(commit
))
1625 set_merge_remote_desc(commit
, name
, obj
);
1630 * Append a commit to the end of the commit_list.
1632 * next starts by pointing to the variable that holds the head of an
1633 * empty commit_list, and is updated to point to the "next" field of
1634 * the last item on the list as new commits are appended.
1638 * struct commit_list *list;
1639 * struct commit_list **next = &list;
1641 * next = commit_list_append(c1, next);
1642 * next = commit_list_append(c2, next);
1643 * assert(commit_list_count(list) == 2);
1646 struct commit_list
**commit_list_append(struct commit
*commit
,
1647 struct commit_list
**next
)
1649 struct commit_list
*new_commit
= xmalloc(sizeof(struct commit_list
));
1650 new_commit
->item
= commit
;
1652 new_commit
->next
= NULL
;
1653 return &new_commit
->next
;
1656 const char *find_header_mem(const char *msg
, size_t len
,
1657 const char *key
, size_t *out_len
)
1659 int key_len
= strlen(key
);
1660 const char *line
= msg
;
1663 * NEEDSWORK: It's possible for strchrnul() to scan beyond the range
1664 * given by len. However, current callers are safe because they compute
1665 * len by scanning a NUL-terminated block of memory starting at msg.
1666 * Nonetheless, it would be better to ensure the function does not look
1667 * at msg beyond the len provided by the caller.
1669 while (line
&& line
< msg
+ len
) {
1670 const char *eol
= strchrnul(line
, '\n');
1675 if (eol
- line
> key_len
&&
1676 !strncmp(line
, key
, key_len
) &&
1677 line
[key_len
] == ' ') {
1678 *out_len
= eol
- line
- key_len
- 1;
1679 return line
+ key_len
+ 1;
1681 line
= *eol
? eol
+ 1 : NULL
;
1686 const char *find_commit_header(const char *msg
, const char *key
, size_t *out_len
)
1688 return find_header_mem(msg
, strlen(msg
), key
, out_len
);
1691 * Inspect the given string and determine the true "end" of the log message, in
1692 * order to find where to put a new Signed-off-by trailer. Ignored are
1693 * trailing comment lines and blank lines. To support "git commit -s
1694 * --amend" on an existing commit, we also ignore "Conflicts:". To
1695 * support "git commit -v", we truncate at cut lines.
1697 * Returns the number of bytes from the tail to ignore, to be fed as
1698 * the second parameter to append_signoff().
1700 size_t ignore_non_trailer(const char *buf
, size_t len
)
1704 int in_old_conflicts_block
= 0;
1705 size_t cutoff
= wt_status_locate_end(buf
, len
);
1707 while (bol
< cutoff
) {
1708 const char *next_line
= memchr(buf
+ bol
, '\n', len
- bol
);
1711 next_line
= buf
+ len
;
1715 if (buf
[bol
] == comment_line_char
|| buf
[bol
] == '\n') {
1716 /* is this the first of the run of comments? */
1719 /* otherwise, it is just continuing */
1720 } else if (starts_with(buf
+ bol
, "Conflicts:\n")) {
1721 in_old_conflicts_block
= 1;
1724 } else if (in_old_conflicts_block
&& buf
[bol
] == '\t') {
1725 ; /* a pathname in the conflicts block */
1727 /* the previous was not trailing comment */
1729 in_old_conflicts_block
= 0;
1731 bol
= next_line
- buf
;
1733 return boc
? len
- boc
: len
- cutoff
;
1736 int run_commit_hook(int editor_is_used
, const char *index_file
,
1737 int *invoked_hook
, const char *name
, ...)
1739 struct run_hooks_opt opt
= RUN_HOOKS_OPT_INIT
;
1743 strvec_pushf(&opt
.env
, "GIT_INDEX_FILE=%s", index_file
);
1746 * Let the hook know that no editor will be launched.
1748 if (!editor_is_used
)
1749 strvec_push(&opt
.env
, "GIT_EDITOR=:");
1751 va_start(args
, name
);
1752 while ((arg
= va_arg(args
, const char *)))
1753 strvec_push(&opt
.args
, arg
);
1756 opt
.invoked_hook
= invoked_hook
;
1757 return run_hooks_opt(name
, &opt
);