9 #include "gpg-interface.h"
10 #include "mergesort.h"
12 static struct commit_extra_header
*read_commit_extra_header_lines(const char *buf
, size_t len
, const char **);
14 int save_commit_buffer
= 1;
16 const char *commit_type
= "commit";
18 static struct commit
*check_commit(struct object
*obj
,
19 const unsigned char *sha1
,
22 if (obj
->type
!= OBJ_COMMIT
) {
24 error("Object %s is a %s, not a commit",
25 sha1_to_hex(sha1
), typename(obj
->type
));
28 return (struct commit
*) obj
;
31 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
34 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
38 return check_commit(obj
, sha1
, quiet
);
41 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
43 return lookup_commit_reference_gently(sha1
, 0);
46 struct commit
*lookup_commit_or_die(const unsigned char *sha1
, const char *ref_name
)
48 struct commit
*c
= lookup_commit_reference(sha1
);
50 die(_("could not parse %s"), ref_name
);
51 if (hashcmp(sha1
, c
->object
.sha1
)) {
52 warning(_("%s %s is not a commit!"),
53 ref_name
, sha1_to_hex(sha1
));
58 struct commit
*lookup_commit(const unsigned char *sha1
)
60 struct object
*obj
= lookup_object(sha1
);
62 return create_object(sha1
, OBJ_COMMIT
, alloc_commit_node());
64 obj
->type
= OBJ_COMMIT
;
65 return check_commit(obj
, sha1
, 0);
68 struct commit
*lookup_commit_reference_by_name(const char *name
)
70 unsigned char sha1
[20];
71 struct commit
*commit
;
73 if (get_sha1_committish(name
, sha1
))
75 commit
= lookup_commit_reference(sha1
);
76 if (!commit
|| parse_commit(commit
))
81 static unsigned long 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 strtoul will stop at buf-1 */
105 return strtoul(dateptr
, NULL
, 10);
108 static struct commit_graft
**commit_graft
;
109 static int commit_graft_alloc
, commit_graft_nr
;
111 static int commit_graft_pos(const unsigned char *sha1
)
115 hi
= commit_graft_nr
;
117 int mi
= (lo
+ hi
) / 2;
118 struct commit_graft
*graft
= commit_graft
[mi
];
119 int cmp
= hashcmp(sha1
, graft
->sha1
);
130 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
132 int pos
= commit_graft_pos(graft
->sha1
);
138 free(commit_graft
[pos
]);
139 commit_graft
[pos
] = graft
;
144 if (commit_graft_alloc
<= ++commit_graft_nr
) {
145 commit_graft_alloc
= alloc_nr(commit_graft_alloc
);
146 commit_graft
= xrealloc(commit_graft
,
147 sizeof(*commit_graft
) *
150 if (pos
< commit_graft_nr
)
151 memmove(commit_graft
+ pos
+ 1,
153 (commit_graft_nr
- pos
- 1) *
154 sizeof(*commit_graft
));
155 commit_graft
[pos
] = graft
;
159 struct commit_graft
*read_graft_line(char *buf
, int len
)
161 /* The format is just "Commit Parent1 Parent2 ...\n" */
163 struct commit_graft
*graft
= NULL
;
165 while (len
&& isspace(buf
[len
-1]))
167 if (buf
[0] == '#' || buf
[0] == '\0')
171 i
= (len
+ 1) / 41 - 1;
172 graft
= xmalloc(sizeof(*graft
) + 20 * i
);
173 graft
->nr_parent
= i
;
174 if (get_sha1_hex(buf
, graft
->sha1
))
176 for (i
= 40; i
< len
; i
+= 41) {
179 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
185 error("bad graft data: %s", buf
);
190 static int read_graft_file(const char *graft_file
)
192 FILE *fp
= fopen(graft_file
, "r");
196 while (fgets(buf
, sizeof(buf
), fp
)) {
197 /* The format is just "Commit Parent1 Parent2 ...\n" */
198 int len
= strlen(buf
);
199 struct commit_graft
*graft
= read_graft_line(buf
, len
);
202 if (register_commit_graft(graft
, 1))
203 error("duplicate graft data: %s", buf
);
209 static void prepare_commit_graft(void)
211 static int commit_graft_prepared
;
214 if (commit_graft_prepared
)
216 graft_file
= get_graft_file();
217 read_graft_file(graft_file
);
218 /* make sure shallows are read */
219 is_repository_shallow();
220 commit_graft_prepared
= 1;
223 struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
226 prepare_commit_graft();
227 pos
= commit_graft_pos(sha1
);
230 return commit_graft
[pos
];
233 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
236 for (i
= ret
= 0; i
< commit_graft_nr
&& !ret
; i
++)
237 ret
= fn(commit_graft
[i
], cb_data
);
241 int unregister_shallow(const unsigned char *sha1
)
243 int pos
= commit_graft_pos(sha1
);
246 if (pos
+ 1 < commit_graft_nr
)
247 memmove(commit_graft
+ pos
, commit_graft
+ pos
+ 1,
248 sizeof(struct commit_graft
*)
249 * (commit_graft_nr
- pos
- 1));
254 int parse_commit_buffer(struct commit
*item
, const void *buffer
, unsigned long size
)
256 const char *tail
= buffer
;
257 const char *bufptr
= buffer
;
258 unsigned char parent
[20];
259 struct commit_list
**pptr
;
260 struct commit_graft
*graft
;
262 if (item
->object
.parsed
)
264 item
->object
.parsed
= 1;
266 if (tail
<= bufptr
+ 46 || memcmp(bufptr
, "tree ", 5) || bufptr
[45] != '\n')
267 return error("bogus commit object %s", sha1_to_hex(item
->object
.sha1
));
268 if (get_sha1_hex(bufptr
+ 5, parent
) < 0)
269 return error("bad tree pointer in commit %s",
270 sha1_to_hex(item
->object
.sha1
));
271 item
->tree
= lookup_tree(parent
);
272 bufptr
+= 46; /* "tree " + "hex sha1" + "\n" */
273 pptr
= &item
->parents
;
275 graft
= lookup_commit_graft(item
->object
.sha1
);
276 while (bufptr
+ 48 < tail
&& !memcmp(bufptr
, "parent ", 7)) {
277 struct commit
*new_parent
;
279 if (tail
<= bufptr
+ 48 ||
280 get_sha1_hex(bufptr
+ 7, parent
) ||
282 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
285 * The clone is shallow if nr_parent < 0, and we must
286 * not traverse its real parents even when we unhide them.
288 if (graft
&& (graft
->nr_parent
< 0 || grafts_replace_parents
))
290 new_parent
= lookup_commit(parent
);
292 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
296 struct commit
*new_parent
;
297 for (i
= 0; i
< graft
->nr_parent
; i
++) {
298 new_parent
= lookup_commit(graft
->parent
[i
]);
301 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
304 item
->date
= parse_commit_date(bufptr
, tail
);
309 int parse_commit(struct commit
*item
)
311 enum object_type type
;
318 if (item
->object
.parsed
)
320 buffer
= read_sha1_file(item
->object
.sha1
, &type
, &size
);
322 return error("Could not read %s",
323 sha1_to_hex(item
->object
.sha1
));
324 if (type
!= OBJ_COMMIT
) {
326 return error("Object %s not a commit",
327 sha1_to_hex(item
->object
.sha1
));
329 ret
= parse_commit_buffer(item
, buffer
, size
);
330 if (save_commit_buffer
&& !ret
) {
331 item
->buffer
= buffer
;
338 int find_commit_subject(const char *commit_buffer
, const char **subject
)
341 const char *p
= commit_buffer
;
343 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
347 for (eol
= p
; *eol
&& *eol
!= '\n'; eol
++)
357 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
359 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
360 new_list
->item
= item
;
361 new_list
->next
= *list_p
;
366 unsigned commit_list_count(const struct commit_list
*l
)
369 for (; l
; l
= l
->next
)
374 void free_commit_list(struct commit_list
*list
)
377 struct commit_list
*temp
= list
;
383 struct commit_list
* commit_list_insert_by_date(struct commit
*item
, struct commit_list
**list
)
385 struct commit_list
**pp
= list
;
386 struct commit_list
*p
;
387 while ((p
= *pp
) != NULL
) {
388 if (p
->item
->date
< item
->date
) {
393 return commit_list_insert(item
, pp
);
396 static int commit_list_compare_by_date(const void *a
, const void *b
)
398 unsigned long a_date
= ((const struct commit_list
*)a
)->item
->date
;
399 unsigned long b_date
= ((const struct commit_list
*)b
)->item
->date
;
407 static void *commit_list_get_next(const void *a
)
409 return ((const struct commit_list
*)a
)->next
;
412 static void commit_list_set_next(void *a
, void *next
)
414 ((struct commit_list
*)a
)->next
= next
;
417 void commit_list_sort_by_date(struct commit_list
**list
)
419 *list
= llist_mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
420 commit_list_compare_by_date
);
423 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
426 struct commit
*ret
= (*list
)->item
;
427 struct commit_list
*parents
= ret
->parents
;
428 struct commit_list
*old
= *list
;
430 *list
= (*list
)->next
;
434 struct commit
*commit
= parents
->item
;
435 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
436 commit
->object
.flags
|= mark
;
437 commit_list_insert_by_date(commit
, list
);
439 parents
= parents
->next
;
444 static void clear_commit_marks_1(struct commit_list
**plist
,
445 struct commit
*commit
, unsigned int mark
)
448 struct commit_list
*parents
;
450 if (!(mark
& commit
->object
.flags
))
453 commit
->object
.flags
&= ~mark
;
455 parents
= commit
->parents
;
459 while ((parents
= parents
->next
))
460 commit_list_insert(parents
->item
, plist
);
462 commit
= commit
->parents
->item
;
466 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
468 struct commit_list
*list
= NULL
;
469 commit_list_insert(commit
, &list
);
471 clear_commit_marks_1(&list
, pop_commit(&list
), mark
);
474 void clear_commit_marks_for_object_array(struct object_array
*a
, unsigned mark
)
476 struct object
*object
;
477 struct commit
*commit
;
480 for (i
= 0; i
< a
->nr
; i
++) {
481 object
= a
->objects
[i
].item
;
482 commit
= lookup_commit_reference_gently(object
->sha1
, 1);
484 clear_commit_marks(commit
, mark
);
488 struct commit
*pop_commit(struct commit_list
**stack
)
490 struct commit_list
*top
= *stack
;
491 struct commit
*item
= top
? top
->item
: NULL
;
501 * Performs an in-place topological sort on the list supplied.
503 void sort_in_topological_order(struct commit_list
** list
, int lifo
)
505 struct commit_list
*next
, *orig
= *list
;
506 struct commit_list
*work
, **insert
;
507 struct commit_list
**pptr
;
513 /* Mark them and clear the indegree */
514 for (next
= orig
; next
; next
= next
->next
) {
515 struct commit
*commit
= next
->item
;
516 commit
->indegree
= 1;
519 /* update the indegree */
520 for (next
= orig
; next
; next
= next
->next
) {
521 struct commit_list
* parents
= next
->item
->parents
;
523 struct commit
*parent
= parents
->item
;
525 if (parent
->indegree
)
527 parents
= parents
->next
;
534 * tips are nodes not reachable from any other node in the list
536 * the tips serve as a starting set for the work queue.
540 for (next
= orig
; next
; next
= next
->next
) {
541 struct commit
*commit
= next
->item
;
543 if (commit
->indegree
== 1)
544 insert
= &commit_list_insert(commit
, insert
)->next
;
547 /* process the list in topological order */
549 commit_list_sort_by_date(&work
);
554 struct commit
*commit
;
555 struct commit_list
*parents
, *work_item
;
558 work
= work_item
->next
;
559 work_item
->next
= NULL
;
561 commit
= work_item
->item
;
562 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
563 struct commit
*parent
= parents
->item
;
565 if (!parent
->indegree
)
569 * parents are only enqueued for emission
570 * when all their children have been emitted thereby
571 * guaranteeing topological order.
573 if (--parent
->indegree
== 1) {
575 commit_list_insert_by_date(parent
, &work
);
577 commit_list_insert(parent
, &work
);
581 * work_item is a commit all of whose children
582 * have already been emitted. we can emit it now.
584 commit
->indegree
= 0;
586 pptr
= &work_item
->next
;
590 /* merge-base stuff */
592 /* bits #0..15 in revision.h */
593 #define PARENT1 (1u<<16)
594 #define PARENT2 (1u<<17)
595 #define STALE (1u<<18)
596 #define RESULT (1u<<19)
598 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
600 static struct commit
*interesting(struct commit_list
*list
)
603 struct commit
*commit
= list
->item
;
605 if (commit
->object
.flags
& STALE
)
612 /* all input commits in one and twos[] must have been parsed! */
613 static struct commit_list
*paint_down_to_common(struct commit
*one
, int n
, struct commit
**twos
)
615 struct commit_list
*list
= NULL
;
616 struct commit_list
*result
= NULL
;
619 one
->object
.flags
|= PARENT1
;
620 commit_list_insert_by_date(one
, &list
);
623 for (i
= 0; i
< n
; i
++) {
624 twos
[i
]->object
.flags
|= PARENT2
;
625 commit_list_insert_by_date(twos
[i
], &list
);
628 while (interesting(list
)) {
629 struct commit
*commit
;
630 struct commit_list
*parents
;
631 struct commit_list
*next
;
639 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
640 if (flags
== (PARENT1
| PARENT2
)) {
641 if (!(commit
->object
.flags
& RESULT
)) {
642 commit
->object
.flags
|= RESULT
;
643 commit_list_insert_by_date(commit
, &result
);
645 /* Mark parents of a found merge stale */
648 parents
= commit
->parents
;
650 struct commit
*p
= parents
->item
;
651 parents
= parents
->next
;
652 if ((p
->object
.flags
& flags
) == flags
)
656 p
->object
.flags
|= flags
;
657 commit_list_insert_by_date(p
, &list
);
661 free_commit_list(list
);
665 static struct commit_list
*merge_bases_many(struct commit
*one
, int n
, struct commit
**twos
)
667 struct commit_list
*list
= NULL
;
668 struct commit_list
*result
= NULL
;
671 for (i
= 0; i
< n
; i
++) {
674 * We do not mark this even with RESULT so we do not
675 * have to clean it up.
677 return commit_list_insert(one
, &result
);
680 if (parse_commit(one
))
682 for (i
= 0; i
< n
; i
++) {
683 if (parse_commit(twos
[i
]))
687 list
= paint_down_to_common(one
, n
, twos
);
690 struct commit_list
*next
= list
->next
;
691 if (!(list
->item
->object
.flags
& STALE
))
692 commit_list_insert_by_date(list
->item
, &result
);
699 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
701 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
702 struct commit_list
**pptr
= &ret
;
704 for (i
= in
; i
; i
= i
->next
) {
706 pptr
= &commit_list_insert(i
->item
, pptr
)->next
;
708 struct commit_list
*new = NULL
, *end
= NULL
;
710 for (j
= ret
; j
; j
= j
->next
) {
711 struct commit_list
*bases
;
712 bases
= get_merge_bases(i
->item
, j
->item
, 1);
717 for (k
= bases
; k
; k
= k
->next
)
726 static int remove_redundant(struct commit
**array
, int cnt
)
729 * Some commit in the array may be an ancestor of
730 * another commit. Move such commit to the end of
731 * the array, and return the number of commits that
732 * are independent from each other.
734 struct commit
**work
;
735 unsigned char *redundant
;
739 work
= xcalloc(cnt
, sizeof(*work
));
740 redundant
= xcalloc(cnt
, 1);
741 filled_index
= xmalloc(sizeof(*filled_index
) * (cnt
- 1));
743 for (i
= 0; i
< cnt
; i
++)
744 parse_commit(array
[i
]);
745 for (i
= 0; i
< cnt
; i
++) {
746 struct commit_list
*common
;
750 for (j
= filled
= 0; j
< cnt
; j
++) {
751 if (i
== j
|| redundant
[j
])
753 filled_index
[filled
] = j
;
754 work
[filled
++] = array
[j
];
756 common
= paint_down_to_common(array
[i
], filled
, work
);
757 if (array
[i
]->object
.flags
& PARENT2
)
759 for (j
= 0; j
< filled
; j
++)
760 if (work
[j
]->object
.flags
& PARENT1
)
761 redundant
[filled_index
[j
]] = 1;
762 clear_commit_marks(array
[i
], all_flags
);
763 for (j
= 0; j
< filled
; j
++)
764 clear_commit_marks(work
[j
], all_flags
);
765 free_commit_list(common
);
768 /* Now collect the result */
769 memcpy(work
, array
, sizeof(*array
) * cnt
);
770 for (i
= filled
= 0; i
< cnt
; i
++)
772 array
[filled
++] = work
[i
];
773 for (j
= filled
, i
= 0; i
< cnt
; i
++)
775 array
[j
++] = work
[i
];
782 struct commit_list
*get_merge_bases_many(struct commit
*one
,
784 struct commit
**twos
,
787 struct commit_list
*list
;
788 struct commit
**rslt
;
789 struct commit_list
*result
;
792 result
= merge_bases_many(one
, n
, twos
);
793 for (i
= 0; i
< n
; i
++) {
797 if (!result
|| !result
->next
) {
799 clear_commit_marks(one
, all_flags
);
800 for (i
= 0; i
< n
; i
++)
801 clear_commit_marks(twos
[i
], all_flags
);
806 /* There are more than one */
813 rslt
= xcalloc(cnt
, sizeof(*rslt
));
814 for (list
= result
, i
= 0; list
; list
= list
->next
)
815 rslt
[i
++] = list
->item
;
816 free_commit_list(result
);
818 clear_commit_marks(one
, all_flags
);
819 for (i
= 0; i
< n
; i
++)
820 clear_commit_marks(twos
[i
], all_flags
);
822 cnt
= remove_redundant(rslt
, cnt
);
824 for (i
= 0; i
< cnt
; i
++)
825 commit_list_insert_by_date(rslt
[i
], &result
);
830 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
,
833 return get_merge_bases_many(one
, 1, &two
, cleanup
);
837 * Is "commit" a decendant of one of the elements on the "with_commit" list?
839 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
843 while (with_commit
) {
844 struct commit
*other
;
846 other
= with_commit
->item
;
847 with_commit
= with_commit
->next
;
848 if (in_merge_bases(other
, commit
))
855 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
857 int in_merge_bases(struct commit
*commit
, struct commit
*reference
)
859 struct commit_list
*bases
;
862 if (parse_commit(commit
) || parse_commit(reference
))
865 bases
= paint_down_to_common(commit
, 1, &reference
);
866 if (commit
->object
.flags
& PARENT2
)
868 clear_commit_marks(commit
, all_flags
);
869 clear_commit_marks(reference
, all_flags
);
870 free_commit_list(bases
);
874 struct commit_list
*reduce_heads(struct commit_list
*heads
)
876 struct commit_list
*p
;
877 struct commit_list
*result
= NULL
, **tail
= &result
;
878 struct commit
**array
;
885 for (p
= heads
; p
; p
= p
->next
)
886 p
->item
->object
.flags
&= ~STALE
;
887 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
888 if (p
->item
->object
.flags
& STALE
)
890 p
->item
->object
.flags
|= STALE
;
893 array
= xcalloc(sizeof(*array
), num_head
);
894 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
895 if (p
->item
->object
.flags
& STALE
) {
896 array
[i
++] = p
->item
;
897 p
->item
->object
.flags
&= ~STALE
;
900 num_head
= remove_redundant(array
, num_head
);
901 for (i
= 0; i
< num_head
; i
++)
902 tail
= &commit_list_insert(array
[i
], tail
)->next
;
906 static const char gpg_sig_header
[] = "gpgsig";
907 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
909 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
911 struct strbuf sig
= STRBUF_INIT
;
914 /* find the end of the header */
915 inspos
= strstr(buf
->buf
, "\n\n") - buf
->buf
+ 1;
917 if (!keyid
|| !*keyid
)
918 keyid
= get_signing_key();
919 if (sign_buffer(buf
, &sig
, keyid
)) {
920 strbuf_release(&sig
);
924 for (copypos
= 0; sig
.buf
[copypos
]; ) {
925 const char *bol
= sig
.buf
+ copypos
;
926 const char *eol
= strchrnul(bol
, '\n');
927 int len
= (eol
- bol
) + !!*eol
;
930 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
931 inspos
+= gpg_sig_header_len
;
933 strbuf_insert(buf
, inspos
++, " ", 1);
934 strbuf_insert(buf
, inspos
, bol
, len
);
938 strbuf_release(&sig
);
942 int parse_signed_commit(const unsigned char *sha1
,
943 struct strbuf
*payload
, struct strbuf
*signature
)
946 enum object_type type
;
947 char *buffer
= read_sha1_file(sha1
, &type
, &size
);
948 int in_signature
, saw_signature
= -1;
951 if (!buffer
|| type
!= OBJ_COMMIT
)
955 tail
= buffer
+ size
;
958 while (line
< tail
) {
959 const char *sig
= NULL
;
960 char *next
= memchr(line
, '\n', tail
- line
);
962 next
= next
? next
+ 1 : tail
;
963 if (in_signature
&& line
[0] == ' ')
965 else if (!prefixcmp(line
, gpg_sig_header
) &&
966 line
[gpg_sig_header_len
] == ' ')
967 sig
= line
+ gpg_sig_header_len
+ 1;
969 strbuf_add(signature
, sig
, next
- sig
);
974 /* dump the whole remainder of the buffer */
976 strbuf_add(payload
, line
, next
- line
);
983 return saw_signature
;
986 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
988 struct merge_remote_desc
*desc
;
989 struct commit_extra_header
*mergetag
;
991 unsigned long size
, len
;
992 enum object_type type
;
994 desc
= merge_remote_util(parent
);
995 if (!desc
|| !desc
->obj
)
997 buf
= read_sha1_file(desc
->obj
->sha1
, &type
, &size
);
998 if (!buf
|| type
!= OBJ_TAG
)
1000 len
= parse_signature(buf
, size
);
1004 * We could verify this signature and either omit the tag when
1005 * it does not validate, but the integrator may not have the
1006 * public key of the signer of the tag he is merging, while a
1007 * later auditor may have it while auditing, so let's not run
1008 * verify-signed-buffer here for now...
1010 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1011 * warn("warning: signed tag unverified.");
1013 mergetag
= xcalloc(1, sizeof(*mergetag
));
1014 mergetag
->key
= xstrdup("mergetag");
1015 mergetag
->value
= buf
;
1016 mergetag
->len
= size
;
1019 *tail
= &mergetag
->next
;
1026 void append_merge_tag_headers(struct commit_list
*parents
,
1027 struct commit_extra_header
***tail
)
1030 struct commit
*parent
= parents
->item
;
1031 handle_signed_tag(parent
, tail
);
1032 parents
= parents
->next
;
1036 static void add_extra_header(struct strbuf
*buffer
,
1037 struct commit_extra_header
*extra
)
1039 strbuf_addstr(buffer
, extra
->key
);
1041 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1043 strbuf_addch(buffer
, '\n');
1046 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1047 const char **exclude
)
1049 struct commit_extra_header
*extra
= NULL
;
1051 enum object_type type
;
1052 char *buffer
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
1053 if (buffer
&& type
== OBJ_COMMIT
)
1054 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1059 static inline int standard_header_field(const char *field
, size_t len
)
1061 return ((len
== 4 && !memcmp(field
, "tree ", 5)) ||
1062 (len
== 6 && !memcmp(field
, "parent ", 7)) ||
1063 (len
== 6 && !memcmp(field
, "author ", 7)) ||
1064 (len
== 9 && !memcmp(field
, "committer ", 10)) ||
1065 (len
== 8 && !memcmp(field
, "encoding ", 9)));
1068 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1074 size_t xlen
= strlen(*exclude
);
1076 !memcmp(field
, *exclude
, xlen
) && field
[xlen
] == ' ')
1083 static struct commit_extra_header
*read_commit_extra_header_lines(
1084 const char *buffer
, size_t size
,
1085 const char **exclude
)
1087 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1088 const char *line
, *next
, *eof
, *eob
;
1089 struct strbuf buf
= STRBUF_INIT
;
1091 for (line
= buffer
, eob
= line
+ size
;
1092 line
< eob
&& *line
!= '\n';
1094 next
= memchr(line
, '\n', eob
- line
);
1095 next
= next
? next
+ 1 : eob
;
1099 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1103 it
->value
= strbuf_detach(&buf
, &it
->len
);
1107 eof
= strchr(line
, ' ');
1111 if (standard_header_field(line
, eof
- line
) ||
1112 excluded_header_field(line
, eof
- line
, exclude
))
1115 it
= xcalloc(1, sizeof(*it
));
1116 it
->key
= xmemdupz(line
, eof
-line
);
1120 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1123 it
->value
= strbuf_detach(&buf
, &it
->len
);
1127 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1130 struct commit_extra_header
*next
= extra
->next
;
1138 int commit_tree(const struct strbuf
*msg
, unsigned char *tree
,
1139 struct commit_list
*parents
, unsigned char *ret
,
1140 const char *author
, const char *sign_commit
)
1142 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1145 append_merge_tag_headers(parents
, &tail
);
1146 result
= commit_tree_extended(msg
, tree
, parents
, ret
,
1147 author
, sign_commit
, extra
);
1148 free_commit_extra_headers(extra
);
1152 static int find_invalid_utf8(const char *buf
, int len
)
1157 unsigned char c
= *buf
++;
1158 int bytes
, bad_offset
;
1163 /* Simple US-ASCII? No worries. */
1167 bad_offset
= offset
-1;
1170 * Count how many more high bits set: that's how
1171 * many more bytes this sequence should have.
1179 /* Must be between 1 and 5 more bytes */
1180 if (bytes
< 1 || bytes
> 5)
1183 /* Do we *have* that many bytes? */
1190 /* And verify that they are good continuation bytes */
1192 if ((*buf
++ & 0xc0) != 0x80)
1196 /* We could/should check the value and length here too */
1202 * This verifies that the buffer is in proper utf8 format.
1204 * If it isn't, it assumes any non-utf8 characters are Latin1,
1205 * and does the conversion.
1207 * Fixme: we should probably also disallow overlong forms and
1208 * invalid characters. But we don't do that currently.
1210 static int verify_utf8(struct strbuf
*buf
)
1218 unsigned char replace
[2];
1220 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1226 strbuf_remove(buf
, pos
, 1);
1228 /* We know 'c' must be in the range 128-255 */
1229 replace
[0] = 0xc0 + (c
>> 6);
1230 replace
[1] = 0x80 + (c
& 0x3f);
1231 strbuf_insert(buf
, pos
, replace
, 2);
1236 static const char commit_utf8_warn
[] =
1237 "Warning: commit message did not conform to UTF-8.\n"
1238 "You may want to amend it after fixing the message, or set the config\n"
1239 "variable i18n.commitencoding to the encoding your project uses.\n";
1241 int commit_tree_extended(const struct strbuf
*msg
, unsigned char *tree
,
1242 struct commit_list
*parents
, unsigned char *ret
,
1243 const char *author
, const char *sign_commit
,
1244 struct commit_extra_header
*extra
)
1247 int encoding_is_utf8
;
1248 struct strbuf buffer
;
1250 assert_sha1_type(tree
, OBJ_TREE
);
1252 if (memchr(msg
->buf
, '\0', msg
->len
))
1253 return error("a NUL byte in commit log message not allowed.");
1255 /* Not having i18n.commitencoding is the same as having utf-8 */
1256 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1258 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1259 strbuf_addf(&buffer
, "tree %s\n", sha1_to_hex(tree
));
1262 * NOTE! This ordering means that the same exact tree merged with a
1263 * different order of parents will be a _different_ changeset even
1264 * if everything else stays the same.
1267 struct commit_list
*next
= parents
->next
;
1268 struct commit
*parent
= parents
->item
;
1270 strbuf_addf(&buffer
, "parent %s\n",
1271 sha1_to_hex(parent
->object
.sha1
));
1276 /* Person/date information */
1278 author
= git_author_info(IDENT_STRICT
);
1279 strbuf_addf(&buffer
, "author %s\n", author
);
1280 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_STRICT
));
1281 if (!encoding_is_utf8
)
1282 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1285 add_extra_header(&buffer
, extra
);
1286 extra
= extra
->next
;
1288 strbuf_addch(&buffer
, '\n');
1290 /* And add the comment */
1291 strbuf_addbuf(&buffer
, msg
);
1293 /* And check the encoding */
1294 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1295 fprintf(stderr
, commit_utf8_warn
);
1297 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
))
1300 result
= write_sha1_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1301 strbuf_release(&buffer
);
1305 struct commit
*get_merge_parent(const char *name
)
1308 struct commit
*commit
;
1309 unsigned char sha1
[20];
1310 if (get_sha1(name
, sha1
))
1312 obj
= parse_object(sha1
);
1313 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1314 if (commit
&& !commit
->util
) {
1315 struct merge_remote_desc
*desc
;
1316 desc
= xmalloc(sizeof(*desc
));
1318 desc
->name
= strdup(name
);
1319 commit
->util
= desc
;
1325 * Append a commit to the end of the commit_list.
1327 * next starts by pointing to the variable that holds the head of an
1328 * empty commit_list, and is updated to point to the "next" field of
1329 * the last item on the list as new commits are appended.
1333 * struct commit_list *list;
1334 * struct commit_list **next = &list;
1336 * next = commit_list_append(c1, next);
1337 * next = commit_list_append(c2, next);
1338 * assert(commit_list_count(list) == 2);
1341 struct commit_list
**commit_list_append(struct commit
*commit
,
1342 struct commit_list
**next
)
1344 struct commit_list
*new = xmalloc(sizeof(struct commit_list
));
1351 void print_commit_list(struct commit_list
*list
,
1352 const char *format_cur
,
1353 const char *format_last
)
1355 for ( ; list
; list
= list
->next
) {
1356 const char *format
= list
->next
? format_cur
: format_last
;
1357 printf(format
, sha1_to_hex(list
->item
->object
.sha1
));