9 #include "gpg-interface.h"
10 #include "mergesort.h"
11 #include "commit-slab.h"
12 #include "prio-queue.h"
13 #include "sha1-lookup.h"
15 static struct commit_extra_header
*read_commit_extra_header_lines(const char *buf
, size_t len
, const char **);
17 int save_commit_buffer
= 1;
19 const char *commit_type
= "commit";
21 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
24 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
28 return object_as_type(obj
, OBJ_COMMIT
, quiet
);
31 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
33 return lookup_commit_reference_gently(sha1
, 0);
36 struct commit
*lookup_commit_or_die(const unsigned char *sha1
, const char *ref_name
)
38 struct commit
*c
= lookup_commit_reference(sha1
);
40 die(_("could not parse %s"), ref_name
);
41 if (hashcmp(sha1
, c
->object
.oid
.hash
)) {
42 warning(_("%s %s is not a commit!"),
43 ref_name
, sha1_to_hex(sha1
));
48 struct commit
*lookup_commit(const unsigned char *sha1
)
50 struct object
*obj
= lookup_object(sha1
);
52 return create_object(sha1
, alloc_commit_node());
53 return object_as_type(obj
, OBJ_COMMIT
, 0);
56 struct commit
*lookup_commit_reference_by_name(const char *name
)
59 struct commit
*commit
;
61 if (get_sha1_committish(name
, oid
.hash
))
63 commit
= lookup_commit_reference(oid
.hash
);
64 if (parse_commit(commit
))
69 static unsigned long parse_commit_date(const char *buf
, const char *tail
)
75 if (memcmp(buf
, "author", 6))
77 while (buf
< tail
&& *buf
++ != '\n')
81 if (memcmp(buf
, "committer", 9))
83 while (buf
< tail
&& *buf
++ != '>')
88 while (buf
< tail
&& *buf
++ != '\n')
92 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
93 return strtoul(dateptr
, NULL
, 10);
96 static struct commit_graft
**commit_graft
;
97 static int commit_graft_alloc
, commit_graft_nr
;
99 static const unsigned char *commit_graft_sha1_access(size_t index
, void *table
)
101 struct commit_graft
**commit_graft_table
= table
;
102 return commit_graft_table
[index
]->oid
.hash
;
105 static int commit_graft_pos(const unsigned char *sha1
)
107 return sha1_pos(sha1
, commit_graft
, commit_graft_nr
,
108 commit_graft_sha1_access
);
111 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
113 int pos
= commit_graft_pos(graft
->oid
.hash
);
119 free(commit_graft
[pos
]);
120 commit_graft
[pos
] = graft
;
125 ALLOC_GROW(commit_graft
, commit_graft_nr
+ 1, commit_graft_alloc
);
127 if (pos
< commit_graft_nr
)
128 memmove(commit_graft
+ pos
+ 1,
130 (commit_graft_nr
- pos
- 1) *
131 sizeof(*commit_graft
));
132 commit_graft
[pos
] = graft
;
136 struct commit_graft
*read_graft_line(char *buf
, int len
)
138 /* The format is just "Commit Parent1 Parent2 ...\n" */
140 struct commit_graft
*graft
= NULL
;
141 const int entry_size
= GIT_SHA1_HEXSZ
+ 1;
143 while (len
&& isspace(buf
[len
-1]))
145 if (buf
[0] == '#' || buf
[0] == '\0')
147 if ((len
+ 1) % entry_size
)
149 i
= (len
+ 1) / entry_size
- 1;
150 graft
= xmalloc(st_add(sizeof(*graft
), st_mult(GIT_SHA1_RAWSZ
, i
)));
151 graft
->nr_parent
= i
;
152 if (get_oid_hex(buf
, &graft
->oid
))
154 for (i
= GIT_SHA1_HEXSZ
; i
< len
; i
+= entry_size
) {
157 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/entry_size
].hash
))
163 error("bad graft data: %s", buf
);
168 static int read_graft_file(const char *graft_file
)
170 FILE *fp
= fopen(graft_file
, "r");
171 struct strbuf buf
= STRBUF_INIT
;
174 while (!strbuf_getwholeline(&buf
, fp
, '\n')) {
175 /* The format is just "Commit Parent1 Parent2 ...\n" */
176 struct commit_graft
*graft
= read_graft_line(buf
.buf
, buf
.len
);
179 if (register_commit_graft(graft
, 1))
180 error("duplicate graft data: %s", buf
.buf
);
183 strbuf_release(&buf
);
187 static void prepare_commit_graft(void)
189 static int commit_graft_prepared
;
192 if (commit_graft_prepared
)
194 graft_file
= get_graft_file();
195 read_graft_file(graft_file
);
196 /* make sure shallows are read */
197 is_repository_shallow();
198 commit_graft_prepared
= 1;
201 struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
204 prepare_commit_graft();
205 pos
= commit_graft_pos(sha1
);
208 return commit_graft
[pos
];
211 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
214 for (i
= ret
= 0; i
< commit_graft_nr
&& !ret
; i
++)
215 ret
= fn(commit_graft
[i
], cb_data
);
219 int unregister_shallow(const unsigned char *sha1
)
221 int pos
= commit_graft_pos(sha1
);
224 if (pos
+ 1 < commit_graft_nr
)
225 memmove(commit_graft
+ pos
, commit_graft
+ pos
+ 1,
226 sizeof(struct commit_graft
*)
227 * (commit_graft_nr
- pos
- 1));
232 struct commit_buffer
{
236 define_commit_slab(buffer_slab
, struct commit_buffer
);
237 static struct buffer_slab buffer_slab
= COMMIT_SLAB_INIT(1, buffer_slab
);
239 void set_commit_buffer(struct commit
*commit
, void *buffer
, unsigned long size
)
241 struct commit_buffer
*v
= buffer_slab_at(&buffer_slab
, commit
);
246 const void *get_cached_commit_buffer(const struct commit
*commit
, unsigned long *sizep
)
248 struct commit_buffer
*v
= buffer_slab_peek(&buffer_slab
, commit
);
259 const void *get_commit_buffer(const struct commit
*commit
, unsigned long *sizep
)
261 const void *ret
= get_cached_commit_buffer(commit
, sizep
);
263 enum object_type type
;
265 ret
= read_sha1_file(commit
->object
.oid
.hash
, &type
, &size
);
267 die("cannot read commit object %s",
268 oid_to_hex(&commit
->object
.oid
));
269 if (type
!= OBJ_COMMIT
)
270 die("expected commit for %s, got %s",
271 oid_to_hex(&commit
->object
.oid
), typename(type
));
278 void unuse_commit_buffer(const struct commit
*commit
, const void *buffer
)
280 struct commit_buffer
*v
= buffer_slab_peek(&buffer_slab
, commit
);
281 if (!(v
&& v
->buffer
== buffer
))
282 free((void *)buffer
);
285 void free_commit_buffer(struct commit
*commit
)
287 struct commit_buffer
*v
= buffer_slab_peek(&buffer_slab
, commit
);
295 const void *detach_commit_buffer(struct commit
*commit
, unsigned long *sizep
)
297 struct commit_buffer
*v
= buffer_slab_peek(&buffer_slab
, commit
);
314 int parse_commit_buffer(struct commit
*item
, const void *buffer
, unsigned long size
)
316 const char *tail
= buffer
;
317 const char *bufptr
= buffer
;
318 struct object_id parent
;
319 struct commit_list
**pptr
;
320 struct commit_graft
*graft
;
321 const int tree_entry_len
= GIT_SHA1_HEXSZ
+ 5;
322 const int parent_entry_len
= GIT_SHA1_HEXSZ
+ 7;
324 if (item
->object
.parsed
)
326 item
->object
.parsed
= 1;
328 if (tail
<= bufptr
+ tree_entry_len
+ 1 || memcmp(bufptr
, "tree ", 5) ||
329 bufptr
[tree_entry_len
] != '\n')
330 return error("bogus commit object %s", oid_to_hex(&item
->object
.oid
));
331 if (get_sha1_hex(bufptr
+ 5, parent
.hash
) < 0)
332 return error("bad tree pointer in commit %s",
333 oid_to_hex(&item
->object
.oid
));
334 item
->tree
= lookup_tree(parent
.hash
);
335 bufptr
+= tree_entry_len
+ 1; /* "tree " + "hex sha1" + "\n" */
336 pptr
= &item
->parents
;
338 graft
= lookup_commit_graft(item
->object
.oid
.hash
);
339 while (bufptr
+ parent_entry_len
< tail
&& !memcmp(bufptr
, "parent ", 7)) {
340 struct commit
*new_parent
;
342 if (tail
<= bufptr
+ parent_entry_len
+ 1 ||
343 get_sha1_hex(bufptr
+ 7, parent
.hash
) ||
344 bufptr
[parent_entry_len
] != '\n')
345 return error("bad parents in commit %s", oid_to_hex(&item
->object
.oid
));
346 bufptr
+= parent_entry_len
+ 1;
348 * The clone is shallow if nr_parent < 0, and we must
349 * not traverse its real parents even when we unhide them.
351 if (graft
&& (graft
->nr_parent
< 0 || grafts_replace_parents
))
353 new_parent
= lookup_commit(parent
.hash
);
355 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
359 struct commit
*new_parent
;
360 for (i
= 0; i
< graft
->nr_parent
; i
++) {
361 new_parent
= lookup_commit(graft
->parent
[i
].hash
);
364 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
367 item
->date
= parse_commit_date(bufptr
, tail
);
372 int parse_commit_gently(struct commit
*item
, int quiet_on_missing
)
374 enum object_type type
;
381 if (item
->object
.parsed
)
383 buffer
= read_sha1_file(item
->object
.oid
.hash
, &type
, &size
);
385 return quiet_on_missing
? -1 :
386 error("Could not read %s",
387 oid_to_hex(&item
->object
.oid
));
388 if (type
!= OBJ_COMMIT
) {
390 return error("Object %s not a commit",
391 oid_to_hex(&item
->object
.oid
));
393 ret
= parse_commit_buffer(item
, buffer
, size
);
394 if (save_commit_buffer
&& !ret
) {
395 set_commit_buffer(item
, buffer
, size
);
402 void parse_commit_or_die(struct commit
*item
)
404 if (parse_commit(item
))
405 die("unable to parse commit %s",
406 item
? oid_to_hex(&item
->object
.oid
) : "(null)");
409 int find_commit_subject(const char *commit_buffer
, const char **subject
)
412 const char *p
= commit_buffer
;
414 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
417 p
= skip_blank_lines(p
+ 2);
418 for (eol
= p
; *eol
&& *eol
!= '\n'; eol
++)
428 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
430 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
431 new_list
->item
= item
;
432 new_list
->next
= *list_p
;
437 unsigned commit_list_count(const struct commit_list
*l
)
440 for (; l
; l
= l
->next
)
445 struct commit_list
*copy_commit_list(struct commit_list
*list
)
447 struct commit_list
*head
= NULL
;
448 struct commit_list
**pp
= &head
;
450 pp
= commit_list_append(list
->item
, pp
);
456 void free_commit_list(struct commit_list
*list
)
462 struct commit_list
* commit_list_insert_by_date(struct commit
*item
, struct commit_list
**list
)
464 struct commit_list
**pp
= list
;
465 struct commit_list
*p
;
466 while ((p
= *pp
) != NULL
) {
467 if (p
->item
->date
< item
->date
) {
472 return commit_list_insert(item
, pp
);
475 static int commit_list_compare_by_date(const void *a
, const void *b
)
477 unsigned long a_date
= ((const struct commit_list
*)a
)->item
->date
;
478 unsigned long b_date
= ((const struct commit_list
*)b
)->item
->date
;
486 static void *commit_list_get_next(const void *a
)
488 return ((const struct commit_list
*)a
)->next
;
491 static void commit_list_set_next(void *a
, void *next
)
493 ((struct commit_list
*)a
)->next
= next
;
496 void commit_list_sort_by_date(struct commit_list
**list
)
498 *list
= llist_mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
499 commit_list_compare_by_date
);
502 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
505 struct commit
*ret
= pop_commit(list
);
506 struct commit_list
*parents
= ret
->parents
;
509 struct commit
*commit
= parents
->item
;
510 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
511 commit
->object
.flags
|= mark
;
512 commit_list_insert_by_date(commit
, list
);
514 parents
= parents
->next
;
519 static void clear_commit_marks_1(struct commit_list
**plist
,
520 struct commit
*commit
, unsigned int mark
)
523 struct commit_list
*parents
;
525 if (!(mark
& commit
->object
.flags
))
528 commit
->object
.flags
&= ~mark
;
530 parents
= commit
->parents
;
534 while ((parents
= parents
->next
))
535 commit_list_insert(parents
->item
, plist
);
537 commit
= commit
->parents
->item
;
541 void clear_commit_marks_many(int nr
, struct commit
**commit
, unsigned int mark
)
543 struct commit_list
*list
= NULL
;
546 commit_list_insert(*commit
, &list
);
550 clear_commit_marks_1(&list
, pop_commit(&list
), mark
);
553 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
555 clear_commit_marks_many(1, &commit
, mark
);
558 void clear_commit_marks_for_object_array(struct object_array
*a
, unsigned mark
)
560 struct object
*object
;
561 struct commit
*commit
;
564 for (i
= 0; i
< a
->nr
; i
++) {
565 object
= a
->objects
[i
].item
;
566 commit
= lookup_commit_reference_gently(object
->oid
.hash
, 1);
568 clear_commit_marks(commit
, mark
);
572 struct commit
*pop_commit(struct commit_list
**stack
)
574 struct commit_list
*top
= *stack
;
575 struct commit
*item
= top
? top
->item
: NULL
;
585 * Topological sort support
588 /* count number of children that have not been emitted */
589 define_commit_slab(indegree_slab
, int);
591 /* record author-date for each commit object */
592 define_commit_slab(author_date_slab
, unsigned long);
594 static void record_author_date(struct author_date_slab
*author_date
,
595 struct commit
*commit
)
597 const char *buffer
= get_commit_buffer(commit
, NULL
);
598 struct ident_split ident
;
599 const char *ident_line
;
604 ident_line
= find_commit_header(buffer
, "author", &ident_len
);
606 goto fail_exit
; /* no author line */
607 if (split_ident_line(&ident
, ident_line
, ident_len
) ||
608 !ident
.date_begin
|| !ident
.date_end
)
609 goto fail_exit
; /* malformed "author" line */
611 date
= strtoul(ident
.date_begin
, &date_end
, 10);
612 if (date_end
!= ident
.date_end
)
613 goto fail_exit
; /* malformed date */
614 *(author_date_slab_at(author_date
, commit
)) = date
;
617 unuse_commit_buffer(commit
, buffer
);
620 static int compare_commits_by_author_date(const void *a_
, const void *b_
,
623 const struct commit
*a
= a_
, *b
= b_
;
624 struct author_date_slab
*author_date
= cb_data
;
625 unsigned long a_date
= *(author_date_slab_at(author_date
, a
));
626 unsigned long b_date
= *(author_date_slab_at(author_date
, b
));
628 /* newer commits with larger date first */
631 else if (a_date
> b_date
)
636 int compare_commits_by_commit_date(const void *a_
, const void *b_
, void *unused
)
638 const struct commit
*a
= a_
, *b
= b_
;
639 /* newer commits with larger date first */
640 if (a
->date
< b
->date
)
642 else if (a
->date
> b
->date
)
648 * Performs an in-place topological sort on the list supplied.
650 void sort_in_topological_order(struct commit_list
**list
, enum rev_sort_order sort_order
)
652 struct commit_list
*next
, *orig
= *list
;
653 struct commit_list
**pptr
;
654 struct indegree_slab indegree
;
655 struct prio_queue queue
;
656 struct commit
*commit
;
657 struct author_date_slab author_date
;
663 init_indegree_slab(&indegree
);
664 memset(&queue
, '\0', sizeof(queue
));
666 switch (sort_order
) {
667 default: /* REV_SORT_IN_GRAPH_ORDER */
668 queue
.compare
= NULL
;
670 case REV_SORT_BY_COMMIT_DATE
:
671 queue
.compare
= compare_commits_by_commit_date
;
673 case REV_SORT_BY_AUTHOR_DATE
:
674 init_author_date_slab(&author_date
);
675 queue
.compare
= compare_commits_by_author_date
;
676 queue
.cb_data
= &author_date
;
680 /* Mark them and clear the indegree */
681 for (next
= orig
; next
; next
= next
->next
) {
682 struct commit
*commit
= next
->item
;
683 *(indegree_slab_at(&indegree
, commit
)) = 1;
684 /* also record the author dates, if needed */
685 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
686 record_author_date(&author_date
, commit
);
689 /* update the indegree */
690 for (next
= orig
; next
; next
= next
->next
) {
691 struct commit_list
*parents
= next
->item
->parents
;
693 struct commit
*parent
= parents
->item
;
694 int *pi
= indegree_slab_at(&indegree
, parent
);
698 parents
= parents
->next
;
705 * tips are nodes not reachable from any other node in the list
707 * the tips serve as a starting set for the work queue.
709 for (next
= orig
; next
; next
= next
->next
) {
710 struct commit
*commit
= next
->item
;
712 if (*(indegree_slab_at(&indegree
, commit
)) == 1)
713 prio_queue_put(&queue
, commit
);
717 * This is unfortunate; the initial tips need to be shown
718 * in the order given from the revision traversal machinery.
720 if (sort_order
== REV_SORT_IN_GRAPH_ORDER
)
721 prio_queue_reverse(&queue
);
723 /* We no longer need the commit list */
724 free_commit_list(orig
);
728 while ((commit
= prio_queue_get(&queue
)) != NULL
) {
729 struct commit_list
*parents
;
731 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
732 struct commit
*parent
= parents
->item
;
733 int *pi
= indegree_slab_at(&indegree
, parent
);
739 * parents are only enqueued for emission
740 * when all their children have been emitted thereby
741 * guaranteeing topological order.
744 prio_queue_put(&queue
, parent
);
747 * all children of commit have already been
748 * emitted. we can emit it now.
750 *(indegree_slab_at(&indegree
, commit
)) = 0;
752 pptr
= &commit_list_insert(commit
, pptr
)->next
;
755 clear_indegree_slab(&indegree
);
756 clear_prio_queue(&queue
);
757 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
758 clear_author_date_slab(&author_date
);
761 /* merge-base stuff */
763 /* Remember to update object flag allocation in object.h */
764 #define PARENT1 (1u<<16)
765 #define PARENT2 (1u<<17)
766 #define STALE (1u<<18)
767 #define RESULT (1u<<19)
769 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
771 static int queue_has_nonstale(struct prio_queue
*queue
)
774 for (i
= 0; i
< queue
->nr
; i
++) {
775 struct commit
*commit
= queue
->array
[i
].data
;
776 if (!(commit
->object
.flags
& STALE
))
782 /* all input commits in one and twos[] must have been parsed! */
783 static struct commit_list
*paint_down_to_common(struct commit
*one
, int n
, struct commit
**twos
)
785 struct prio_queue queue
= { compare_commits_by_commit_date
};
786 struct commit_list
*result
= NULL
;
789 one
->object
.flags
|= PARENT1
;
791 commit_list_append(one
, &result
);
794 prio_queue_put(&queue
, one
);
796 for (i
= 0; i
< n
; i
++) {
797 twos
[i
]->object
.flags
|= PARENT2
;
798 prio_queue_put(&queue
, twos
[i
]);
801 while (queue_has_nonstale(&queue
)) {
802 struct commit
*commit
= prio_queue_get(&queue
);
803 struct commit_list
*parents
;
806 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
807 if (flags
== (PARENT1
| PARENT2
)) {
808 if (!(commit
->object
.flags
& RESULT
)) {
809 commit
->object
.flags
|= RESULT
;
810 commit_list_insert_by_date(commit
, &result
);
812 /* Mark parents of a found merge stale */
815 parents
= commit
->parents
;
817 struct commit
*p
= parents
->item
;
818 parents
= parents
->next
;
819 if ((p
->object
.flags
& flags
) == flags
)
823 p
->object
.flags
|= flags
;
824 prio_queue_put(&queue
, p
);
828 clear_prio_queue(&queue
);
832 static struct commit_list
*merge_bases_many(struct commit
*one
, int n
, struct commit
**twos
)
834 struct commit_list
*list
= NULL
;
835 struct commit_list
*result
= NULL
;
838 for (i
= 0; i
< n
; i
++) {
841 * We do not mark this even with RESULT so we do not
842 * have to clean it up.
844 return commit_list_insert(one
, &result
);
847 if (parse_commit(one
))
849 for (i
= 0; i
< n
; i
++) {
850 if (parse_commit(twos
[i
]))
854 list
= paint_down_to_common(one
, n
, twos
);
857 struct commit
*commit
= pop_commit(&list
);
858 if (!(commit
->object
.flags
& STALE
))
859 commit_list_insert_by_date(commit
, &result
);
864 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
866 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
871 commit_list_insert(in
->item
, &ret
);
873 for (i
= in
->next
; i
; i
= i
->next
) {
874 struct commit_list
*new = NULL
, *end
= NULL
;
876 for (j
= ret
; j
; j
= j
->next
) {
877 struct commit_list
*bases
;
878 bases
= get_merge_bases(i
->item
, j
->item
);
883 for (k
= bases
; k
; k
= k
->next
)
891 static int remove_redundant(struct commit
**array
, int cnt
)
894 * Some commit in the array may be an ancestor of
895 * another commit. Move such commit to the end of
896 * the array, and return the number of commits that
897 * are independent from each other.
899 struct commit
**work
;
900 unsigned char *redundant
;
904 work
= xcalloc(cnt
, sizeof(*work
));
905 redundant
= xcalloc(cnt
, 1);
906 ALLOC_ARRAY(filled_index
, cnt
- 1);
908 for (i
= 0; i
< cnt
; i
++)
909 parse_commit(array
[i
]);
910 for (i
= 0; i
< cnt
; i
++) {
911 struct commit_list
*common
;
915 for (j
= filled
= 0; j
< cnt
; j
++) {
916 if (i
== j
|| redundant
[j
])
918 filled_index
[filled
] = j
;
919 work
[filled
++] = array
[j
];
921 common
= paint_down_to_common(array
[i
], filled
, work
);
922 if (array
[i
]->object
.flags
& PARENT2
)
924 for (j
= 0; j
< filled
; j
++)
925 if (work
[j
]->object
.flags
& PARENT1
)
926 redundant
[filled_index
[j
]] = 1;
927 clear_commit_marks(array
[i
], all_flags
);
928 for (j
= 0; j
< filled
; j
++)
929 clear_commit_marks(work
[j
], all_flags
);
930 free_commit_list(common
);
933 /* Now collect the result */
934 memcpy(work
, array
, sizeof(*array
) * cnt
);
935 for (i
= filled
= 0; i
< cnt
; i
++)
937 array
[filled
++] = work
[i
];
938 for (j
= filled
, i
= 0; i
< cnt
; i
++)
940 array
[j
++] = work
[i
];
947 static struct commit_list
*get_merge_bases_many_0(struct commit
*one
,
949 struct commit
**twos
,
952 struct commit_list
*list
;
953 struct commit
**rslt
;
954 struct commit_list
*result
;
957 result
= merge_bases_many(one
, n
, twos
);
958 for (i
= 0; i
< n
; i
++) {
962 if (!result
|| !result
->next
) {
964 clear_commit_marks(one
, all_flags
);
965 clear_commit_marks_many(n
, twos
, all_flags
);
970 /* There are more than one */
971 cnt
= commit_list_count(result
);
972 rslt
= xcalloc(cnt
, sizeof(*rslt
));
973 for (list
= result
, i
= 0; list
; list
= list
->next
)
974 rslt
[i
++] = list
->item
;
975 free_commit_list(result
);
977 clear_commit_marks(one
, all_flags
);
978 clear_commit_marks_many(n
, twos
, all_flags
);
980 cnt
= remove_redundant(rslt
, cnt
);
982 for (i
= 0; i
< cnt
; i
++)
983 commit_list_insert_by_date(rslt
[i
], &result
);
988 struct commit_list
*get_merge_bases_many(struct commit
*one
,
990 struct commit
**twos
)
992 return get_merge_bases_many_0(one
, n
, twos
, 1);
995 struct commit_list
*get_merge_bases_many_dirty(struct commit
*one
,
997 struct commit
**twos
)
999 return get_merge_bases_many_0(one
, n
, twos
, 0);
1002 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
)
1004 return get_merge_bases_many_0(one
, 1, &two
, 1);
1008 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1010 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
1014 while (with_commit
) {
1015 struct commit
*other
;
1017 other
= with_commit
->item
;
1018 with_commit
= with_commit
->next
;
1019 if (in_merge_bases(other
, commit
))
1026 * Is "commit" an ancestor of one of the "references"?
1028 int in_merge_bases_many(struct commit
*commit
, int nr_reference
, struct commit
**reference
)
1030 struct commit_list
*bases
;
1033 if (parse_commit(commit
))
1035 for (i
= 0; i
< nr_reference
; i
++)
1036 if (parse_commit(reference
[i
]))
1039 bases
= paint_down_to_common(commit
, nr_reference
, reference
);
1040 if (commit
->object
.flags
& PARENT2
)
1042 clear_commit_marks(commit
, all_flags
);
1043 clear_commit_marks_many(nr_reference
, reference
, all_flags
);
1044 free_commit_list(bases
);
1049 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1051 int in_merge_bases(struct commit
*commit
, struct commit
*reference
)
1053 return in_merge_bases_many(commit
, 1, &reference
);
1056 struct commit_list
*reduce_heads(struct commit_list
*heads
)
1058 struct commit_list
*p
;
1059 struct commit_list
*result
= NULL
, **tail
= &result
;
1060 struct commit
**array
;
1067 for (p
= heads
; p
; p
= p
->next
)
1068 p
->item
->object
.flags
&= ~STALE
;
1069 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
1070 if (p
->item
->object
.flags
& STALE
)
1072 p
->item
->object
.flags
|= STALE
;
1075 array
= xcalloc(num_head
, sizeof(*array
));
1076 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
1077 if (p
->item
->object
.flags
& STALE
) {
1078 array
[i
++] = p
->item
;
1079 p
->item
->object
.flags
&= ~STALE
;
1082 num_head
= remove_redundant(array
, num_head
);
1083 for (i
= 0; i
< num_head
; i
++)
1084 tail
= &commit_list_insert(array
[i
], tail
)->next
;
1088 static const char gpg_sig_header
[] = "gpgsig";
1089 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
1091 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
1093 struct strbuf sig
= STRBUF_INIT
;
1094 int inspos
, copypos
;
1097 /* find the end of the header */
1098 eoh
= strstr(buf
->buf
, "\n\n");
1102 inspos
= eoh
- buf
->buf
+ 1;
1104 if (!keyid
|| !*keyid
)
1105 keyid
= get_signing_key();
1106 if (sign_buffer(buf
, &sig
, keyid
)) {
1107 strbuf_release(&sig
);
1111 for (copypos
= 0; sig
.buf
[copypos
]; ) {
1112 const char *bol
= sig
.buf
+ copypos
;
1113 const char *eol
= strchrnul(bol
, '\n');
1114 int len
= (eol
- bol
) + !!*eol
;
1117 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
1118 inspos
+= gpg_sig_header_len
;
1120 strbuf_insert(buf
, inspos
++, " ", 1);
1121 strbuf_insert(buf
, inspos
, bol
, len
);
1125 strbuf_release(&sig
);
1129 int parse_signed_commit(const struct commit
*commit
,
1130 struct strbuf
*payload
, struct strbuf
*signature
)
1134 const char *buffer
= get_commit_buffer(commit
, &size
);
1135 int in_signature
, saw_signature
= -1;
1136 const char *line
, *tail
;
1139 tail
= buffer
+ size
;
1142 while (line
< tail
) {
1143 const char *sig
= NULL
;
1144 const char *next
= memchr(line
, '\n', tail
- line
);
1146 next
= next
? next
+ 1 : tail
;
1147 if (in_signature
&& line
[0] == ' ')
1149 else if (starts_with(line
, gpg_sig_header
) &&
1150 line
[gpg_sig_header_len
] == ' ')
1151 sig
= line
+ gpg_sig_header_len
+ 1;
1153 strbuf_add(signature
, sig
, next
- sig
);
1158 /* dump the whole remainder of the buffer */
1160 strbuf_add(payload
, line
, next
- line
);
1165 unuse_commit_buffer(commit
, buffer
);
1166 return saw_signature
;
1169 int remove_signature(struct strbuf
*buf
)
1171 const char *line
= buf
->buf
;
1172 const char *tail
= buf
->buf
+ buf
->len
;
1173 int in_signature
= 0;
1174 const char *sig_start
= NULL
;
1175 const char *sig_end
= NULL
;
1177 while (line
< tail
) {
1178 const char *next
= memchr(line
, '\n', tail
- line
);
1179 next
= next
? next
+ 1 : tail
;
1181 if (in_signature
&& line
[0] == ' ')
1183 else if (starts_with(line
, gpg_sig_header
) &&
1184 line
[gpg_sig_header_len
] == ' ') {
1190 /* dump the whole remainder of the buffer */
1198 strbuf_remove(buf
, sig_start
- buf
->buf
, sig_end
- sig_start
);
1200 return sig_start
!= NULL
;
1203 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
1205 struct merge_remote_desc
*desc
;
1206 struct commit_extra_header
*mergetag
;
1208 unsigned long size
, len
;
1209 enum object_type type
;
1211 desc
= merge_remote_util(parent
);
1212 if (!desc
|| !desc
->obj
)
1214 buf
= read_sha1_file(desc
->obj
->oid
.hash
, &type
, &size
);
1215 if (!buf
|| type
!= OBJ_TAG
)
1217 len
= parse_signature(buf
, size
);
1221 * We could verify this signature and either omit the tag when
1222 * it does not validate, but the integrator may not have the
1223 * public key of the signer of the tag he is merging, while a
1224 * later auditor may have it while auditing, so let's not run
1225 * verify-signed-buffer here for now...
1227 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1228 * warn("warning: signed tag unverified.");
1230 mergetag
= xcalloc(1, sizeof(*mergetag
));
1231 mergetag
->key
= xstrdup("mergetag");
1232 mergetag
->value
= buf
;
1233 mergetag
->len
= size
;
1236 *tail
= &mergetag
->next
;
1243 int check_commit_signature(const struct commit
*commit
, struct signature_check
*sigc
)
1245 struct strbuf payload
= STRBUF_INIT
;
1246 struct strbuf signature
= STRBUF_INIT
;
1251 if (parse_signed_commit(commit
, &payload
, &signature
) <= 0)
1253 ret
= check_signature(payload
.buf
, payload
.len
, signature
.buf
,
1254 signature
.len
, sigc
);
1257 strbuf_release(&payload
);
1258 strbuf_release(&signature
);
1265 void append_merge_tag_headers(struct commit_list
*parents
,
1266 struct commit_extra_header
***tail
)
1269 struct commit
*parent
= parents
->item
;
1270 handle_signed_tag(parent
, tail
);
1271 parents
= parents
->next
;
1275 static void add_extra_header(struct strbuf
*buffer
,
1276 struct commit_extra_header
*extra
)
1278 strbuf_addstr(buffer
, extra
->key
);
1280 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1282 strbuf_addch(buffer
, '\n');
1285 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1286 const char **exclude
)
1288 struct commit_extra_header
*extra
= NULL
;
1290 const char *buffer
= get_commit_buffer(commit
, &size
);
1291 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1292 unuse_commit_buffer(commit
, buffer
);
1296 void for_each_mergetag(each_mergetag_fn fn
, struct commit
*commit
, void *data
)
1298 struct commit_extra_header
*extra
, *to_free
;
1300 to_free
= read_commit_extra_headers(commit
, NULL
);
1301 for (extra
= to_free
; extra
; extra
= extra
->next
) {
1302 if (strcmp(extra
->key
, "mergetag"))
1303 continue; /* not a merge tag */
1304 fn(commit
, extra
, data
);
1306 free_commit_extra_headers(to_free
);
1309 static inline int standard_header_field(const char *field
, size_t len
)
1311 return ((len
== 4 && !memcmp(field
, "tree ", 5)) ||
1312 (len
== 6 && !memcmp(field
, "parent ", 7)) ||
1313 (len
== 6 && !memcmp(field
, "author ", 7)) ||
1314 (len
== 9 && !memcmp(field
, "committer ", 10)) ||
1315 (len
== 8 && !memcmp(field
, "encoding ", 9)));
1318 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1324 size_t xlen
= strlen(*exclude
);
1326 !memcmp(field
, *exclude
, xlen
) && field
[xlen
] == ' ')
1333 static struct commit_extra_header
*read_commit_extra_header_lines(
1334 const char *buffer
, size_t size
,
1335 const char **exclude
)
1337 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1338 const char *line
, *next
, *eof
, *eob
;
1339 struct strbuf buf
= STRBUF_INIT
;
1341 for (line
= buffer
, eob
= line
+ size
;
1342 line
< eob
&& *line
!= '\n';
1344 next
= memchr(line
, '\n', eob
- line
);
1345 next
= next
? next
+ 1 : eob
;
1349 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1353 it
->value
= strbuf_detach(&buf
, &it
->len
);
1357 eof
= strchr(line
, ' ');
1361 if (standard_header_field(line
, eof
- line
) ||
1362 excluded_header_field(line
, eof
- line
, exclude
))
1365 it
= xcalloc(1, sizeof(*it
));
1366 it
->key
= xmemdupz(line
, eof
-line
);
1370 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1373 it
->value
= strbuf_detach(&buf
, &it
->len
);
1377 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1380 struct commit_extra_header
*next
= extra
->next
;
1388 int commit_tree(const char *msg
, size_t msg_len
,
1389 const unsigned char *tree
,
1390 struct commit_list
*parents
, unsigned char *ret
,
1391 const char *author
, const char *sign_commit
)
1393 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1396 append_merge_tag_headers(parents
, &tail
);
1397 result
= commit_tree_extended(msg
, msg_len
, tree
, parents
, ret
,
1398 author
, sign_commit
, extra
);
1399 free_commit_extra_headers(extra
);
1403 static int find_invalid_utf8(const char *buf
, int len
)
1406 static const unsigned int max_codepoint
[] = {
1407 0x7f, 0x7ff, 0xffff, 0x10ffff
1411 unsigned char c
= *buf
++;
1412 int bytes
, bad_offset
;
1413 unsigned int codepoint
;
1414 unsigned int min_val
, max_val
;
1419 /* Simple US-ASCII? No worries. */
1423 bad_offset
= offset
-1;
1426 * Count how many more high bits set: that's how
1427 * many more bytes this sequence should have.
1436 * Must be between 1 and 3 more bytes. Longer sequences result in
1437 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1439 if (bytes
< 1 || 3 < bytes
)
1442 /* Do we *have* that many bytes? */
1447 * Place the encoded bits at the bottom of the value and compute the
1450 codepoint
= (c
& 0x7f) >> bytes
;
1451 min_val
= max_codepoint
[bytes
-1] + 1;
1452 max_val
= max_codepoint
[bytes
];
1457 /* And verify that they are good continuation bytes */
1460 codepoint
|= *buf
& 0x3f;
1461 if ((*buf
++ & 0xc0) != 0x80)
1465 /* Reject codepoints that are out of range for the sequence length. */
1466 if (codepoint
< min_val
|| codepoint
> max_val
)
1468 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1469 if ((codepoint
& 0x1ff800) == 0xd800)
1471 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1472 if ((codepoint
& 0xfffe) == 0xfffe)
1474 /* So are anything in the range U+FDD0..U+FDEF. */
1475 if (codepoint
>= 0xfdd0 && codepoint
<= 0xfdef)
1482 * This verifies that the buffer is in proper utf8 format.
1484 * If it isn't, it assumes any non-utf8 characters are Latin1,
1485 * and does the conversion.
1487 static int verify_utf8(struct strbuf
*buf
)
1495 unsigned char replace
[2];
1497 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1503 strbuf_remove(buf
, pos
, 1);
1505 /* We know 'c' must be in the range 128-255 */
1506 replace
[0] = 0xc0 + (c
>> 6);
1507 replace
[1] = 0x80 + (c
& 0x3f);
1508 strbuf_insert(buf
, pos
, replace
, 2);
1513 static const char commit_utf8_warn
[] =
1514 N_("Warning: commit message did not conform to UTF-8.\n"
1515 "You may want to amend it after fixing the message, or set the config\n"
1516 "variable i18n.commitencoding to the encoding your project uses.\n");
1518 int commit_tree_extended(const char *msg
, size_t msg_len
,
1519 const unsigned char *tree
,
1520 struct commit_list
*parents
, unsigned char *ret
,
1521 const char *author
, const char *sign_commit
,
1522 struct commit_extra_header
*extra
)
1525 int encoding_is_utf8
;
1526 struct strbuf buffer
;
1528 assert_sha1_type(tree
, OBJ_TREE
);
1530 if (memchr(msg
, '\0', msg_len
))
1531 return error("a NUL byte in commit log message not allowed.");
1533 /* Not having i18n.commitencoding is the same as having utf-8 */
1534 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1536 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1537 strbuf_addf(&buffer
, "tree %s\n", sha1_to_hex(tree
));
1540 * NOTE! This ordering means that the same exact tree merged with a
1541 * different order of parents will be a _different_ changeset even
1542 * if everything else stays the same.
1545 struct commit
*parent
= pop_commit(&parents
);
1546 strbuf_addf(&buffer
, "parent %s\n",
1547 oid_to_hex(&parent
->object
.oid
));
1550 /* Person/date information */
1552 author
= git_author_info(IDENT_STRICT
);
1553 strbuf_addf(&buffer
, "author %s\n", author
);
1554 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_STRICT
));
1555 if (!encoding_is_utf8
)
1556 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1559 add_extra_header(&buffer
, extra
);
1560 extra
= extra
->next
;
1562 strbuf_addch(&buffer
, '\n');
1564 /* And add the comment */
1565 strbuf_add(&buffer
, msg
, msg_len
);
1567 /* And check the encoding */
1568 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1569 fprintf(stderr
, _(commit_utf8_warn
));
1571 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
))
1574 result
= write_sha1_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1575 strbuf_release(&buffer
);
1579 void set_merge_remote_desc(struct commit
*commit
,
1580 const char *name
, struct object
*obj
)
1582 struct merge_remote_desc
*desc
;
1583 FLEX_ALLOC_STR(desc
, name
, name
);
1585 commit
->util
= desc
;
1588 struct commit
*get_merge_parent(const char *name
)
1591 struct commit
*commit
;
1592 struct object_id oid
;
1593 if (get_sha1(name
, oid
.hash
))
1595 obj
= parse_object(oid
.hash
);
1596 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1597 if (commit
&& !commit
->util
)
1598 set_merge_remote_desc(commit
, name
, obj
);
1603 * Append a commit to the end of the commit_list.
1605 * next starts by pointing to the variable that holds the head of an
1606 * empty commit_list, and is updated to point to the "next" field of
1607 * the last item on the list as new commits are appended.
1611 * struct commit_list *list;
1612 * struct commit_list **next = &list;
1614 * next = commit_list_append(c1, next);
1615 * next = commit_list_append(c2, next);
1616 * assert(commit_list_count(list) == 2);
1619 struct commit_list
**commit_list_append(struct commit
*commit
,
1620 struct commit_list
**next
)
1622 struct commit_list
*new = xmalloc(sizeof(struct commit_list
));
1629 const char *find_commit_header(const char *msg
, const char *key
, size_t *out_len
)
1631 int key_len
= strlen(key
);
1632 const char *line
= msg
;
1635 const char *eol
= strchrnul(line
, '\n');
1640 if (eol
- line
> key_len
&&
1641 !strncmp(line
, key
, key_len
) &&
1642 line
[key_len
] == ' ') {
1643 *out_len
= eol
- line
- key_len
- 1;
1644 return line
+ key_len
+ 1;
1646 line
= *eol
? eol
+ 1 : NULL
;
1652 * Inspect sb and determine the true "end" of the log message, in
1653 * order to find where to put a new Signed-off-by: line. Ignored are
1654 * trailing comment lines and blank lines, and also the traditional
1655 * "Conflicts:" block that is not commented out, so that we can use
1656 * "git commit -s --amend" on an existing commit that forgot to remove
1659 * Returns the number of bytes from the tail to ignore, to be fed as
1660 * the second parameter to append_signoff().
1662 int ignore_non_trailer(struct strbuf
*sb
)
1666 int in_old_conflicts_block
= 0;
1668 while (bol
< sb
->len
) {
1671 if (!(next_line
= memchr(sb
->buf
+ bol
, '\n', sb
->len
- bol
)))
1672 next_line
= sb
->buf
+ sb
->len
;
1676 if (sb
->buf
[bol
] == comment_line_char
|| sb
->buf
[bol
] == '\n') {
1677 /* is this the first of the run of comments? */
1680 /* otherwise, it is just continuing */
1681 } else if (starts_with(sb
->buf
+ bol
, "Conflicts:\n")) {
1682 in_old_conflicts_block
= 1;
1685 } else if (in_old_conflicts_block
&& sb
->buf
[bol
] == '\t') {
1686 ; /* a pathname in the conflicts block */
1688 /* the previous was not trailing comment */
1690 in_old_conflicts_block
= 0;
1692 bol
= next_line
- sb
->buf
;
1694 return boc
? sb
->len
- boc
: 0;