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";
17 static int commit_count
;
19 static struct commit
*check_commit(struct object
*obj
,
20 const unsigned char *sha1
,
23 if (obj
->type
!= OBJ_COMMIT
) {
25 error("Object %s is a %s, not a commit",
26 sha1_to_hex(sha1
), typename(obj
->type
));
29 return (struct commit
*) obj
;
32 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
35 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
39 return check_commit(obj
, sha1
, quiet
);
42 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
44 return lookup_commit_reference_gently(sha1
, 0);
47 struct commit
*lookup_commit_or_die(const unsigned char *sha1
, const char *ref_name
)
49 struct commit
*c
= lookup_commit_reference(sha1
);
51 die(_("could not parse %s"), ref_name
);
52 if (hashcmp(sha1
, c
->object
.sha1
)) {
53 warning(_("%s %s is not a commit!"),
54 ref_name
, sha1_to_hex(sha1
));
59 struct commit
*lookup_commit(const unsigned char *sha1
)
61 struct object
*obj
= lookup_object(sha1
);
63 struct commit
*c
= alloc_commit_node();
64 c
->index
= commit_count
++;
65 return create_object(sha1
, OBJ_COMMIT
, c
);
68 obj
->type
= OBJ_COMMIT
;
69 return check_commit(obj
, sha1
, 0);
72 struct commit
*lookup_commit_reference_by_name(const char *name
)
74 unsigned char sha1
[20];
75 struct commit
*commit
;
77 if (get_sha1_committish(name
, sha1
))
79 commit
= lookup_commit_reference(sha1
);
80 if (!commit
|| parse_commit(commit
))
85 static unsigned long parse_commit_date(const char *buf
, const char *tail
)
91 if (memcmp(buf
, "author", 6))
93 while (buf
< tail
&& *buf
++ != '\n')
97 if (memcmp(buf
, "committer", 9))
99 while (buf
< tail
&& *buf
++ != '>')
104 while (buf
< tail
&& *buf
++ != '\n')
108 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
109 return strtoul(dateptr
, NULL
, 10);
112 static struct commit_graft
**commit_graft
;
113 static int commit_graft_alloc
, commit_graft_nr
;
115 static int commit_graft_pos(const unsigned char *sha1
)
119 hi
= commit_graft_nr
;
121 int mi
= (lo
+ hi
) / 2;
122 struct commit_graft
*graft
= commit_graft
[mi
];
123 int cmp
= hashcmp(sha1
, graft
->sha1
);
134 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
136 int pos
= commit_graft_pos(graft
->sha1
);
142 free(commit_graft
[pos
]);
143 commit_graft
[pos
] = graft
;
148 if (commit_graft_alloc
<= ++commit_graft_nr
) {
149 commit_graft_alloc
= alloc_nr(commit_graft_alloc
);
150 commit_graft
= xrealloc(commit_graft
,
151 sizeof(*commit_graft
) *
154 if (pos
< commit_graft_nr
)
155 memmove(commit_graft
+ pos
+ 1,
157 (commit_graft_nr
- pos
- 1) *
158 sizeof(*commit_graft
));
159 commit_graft
[pos
] = graft
;
163 struct commit_graft
*read_graft_line(char *buf
, int len
)
165 /* The format is just "Commit Parent1 Parent2 ...\n" */
167 struct commit_graft
*graft
= NULL
;
169 while (len
&& isspace(buf
[len
-1]))
171 if (buf
[0] == '#' || buf
[0] == '\0')
175 i
= (len
+ 1) / 41 - 1;
176 graft
= xmalloc(sizeof(*graft
) + 20 * i
);
177 graft
->nr_parent
= i
;
178 if (get_sha1_hex(buf
, graft
->sha1
))
180 for (i
= 40; i
< len
; i
+= 41) {
183 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
189 error("bad graft data: %s", buf
);
194 static int read_graft_file(const char *graft_file
)
196 FILE *fp
= fopen(graft_file
, "r");
200 while (fgets(buf
, sizeof(buf
), fp
)) {
201 /* The format is just "Commit Parent1 Parent2 ...\n" */
202 int len
= strlen(buf
);
203 struct commit_graft
*graft
= read_graft_line(buf
, len
);
206 if (register_commit_graft(graft
, 1))
207 error("duplicate graft data: %s", buf
);
213 static void prepare_commit_graft(void)
215 static int commit_graft_prepared
;
218 if (commit_graft_prepared
)
220 graft_file
= get_graft_file();
221 read_graft_file(graft_file
);
222 /* make sure shallows are read */
223 is_repository_shallow();
224 commit_graft_prepared
= 1;
227 struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
230 prepare_commit_graft();
231 pos
= commit_graft_pos(sha1
);
234 return commit_graft
[pos
];
237 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
240 for (i
= ret
= 0; i
< commit_graft_nr
&& !ret
; i
++)
241 ret
= fn(commit_graft
[i
], cb_data
);
245 int unregister_shallow(const unsigned char *sha1
)
247 int pos
= commit_graft_pos(sha1
);
250 if (pos
+ 1 < commit_graft_nr
)
251 memmove(commit_graft
+ pos
, commit_graft
+ pos
+ 1,
252 sizeof(struct commit_graft
*)
253 * (commit_graft_nr
- pos
- 1));
258 int parse_commit_buffer(struct commit
*item
, const void *buffer
, unsigned long size
)
260 const char *tail
= buffer
;
261 const char *bufptr
= buffer
;
262 unsigned char parent
[20];
263 struct commit_list
**pptr
;
264 struct commit_graft
*graft
;
266 if (item
->object
.parsed
)
268 item
->object
.parsed
= 1;
270 if (tail
<= bufptr
+ 46 || memcmp(bufptr
, "tree ", 5) || bufptr
[45] != '\n')
271 return error("bogus commit object %s", sha1_to_hex(item
->object
.sha1
));
272 if (get_sha1_hex(bufptr
+ 5, parent
) < 0)
273 return error("bad tree pointer in commit %s",
274 sha1_to_hex(item
->object
.sha1
));
275 item
->tree
= lookup_tree(parent
);
276 bufptr
+= 46; /* "tree " + "hex sha1" + "\n" */
277 pptr
= &item
->parents
;
279 graft
= lookup_commit_graft(item
->object
.sha1
);
280 while (bufptr
+ 48 < tail
&& !memcmp(bufptr
, "parent ", 7)) {
281 struct commit
*new_parent
;
283 if (tail
<= bufptr
+ 48 ||
284 get_sha1_hex(bufptr
+ 7, parent
) ||
286 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
289 * The clone is shallow if nr_parent < 0, and we must
290 * not traverse its real parents even when we unhide them.
292 if (graft
&& (graft
->nr_parent
< 0 || grafts_replace_parents
))
294 new_parent
= lookup_commit(parent
);
296 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
300 struct commit
*new_parent
;
301 for (i
= 0; i
< graft
->nr_parent
; i
++) {
302 new_parent
= lookup_commit(graft
->parent
[i
]);
305 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
308 item
->date
= parse_commit_date(bufptr
, tail
);
313 int parse_commit(struct commit
*item
)
315 enum object_type type
;
322 if (item
->object
.parsed
)
324 buffer
= read_sha1_file(item
->object
.sha1
, &type
, &size
);
326 return error("Could not read %s",
327 sha1_to_hex(item
->object
.sha1
));
328 if (type
!= OBJ_COMMIT
) {
330 return error("Object %s not a commit",
331 sha1_to_hex(item
->object
.sha1
));
333 ret
= parse_commit_buffer(item
, buffer
, size
);
334 if (save_commit_buffer
&& !ret
) {
335 item
->buffer
= buffer
;
342 int find_commit_subject(const char *commit_buffer
, const char **subject
)
345 const char *p
= commit_buffer
;
347 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
351 for (eol
= p
; *eol
&& *eol
!= '\n'; eol
++)
361 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
363 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
364 new_list
->item
= item
;
365 new_list
->next
= *list_p
;
370 unsigned commit_list_count(const struct commit_list
*l
)
373 for (; l
; l
= l
->next
)
378 void free_commit_list(struct commit_list
*list
)
381 struct commit_list
*temp
= list
;
387 struct commit_list
* commit_list_insert_by_date(struct commit
*item
, struct commit_list
**list
)
389 struct commit_list
**pp
= list
;
390 struct commit_list
*p
;
391 while ((p
= *pp
) != NULL
) {
392 if (p
->item
->date
< item
->date
) {
397 return commit_list_insert(item
, pp
);
400 static int commit_list_compare_by_date(const void *a
, const void *b
)
402 unsigned long a_date
= ((const struct commit_list
*)a
)->item
->date
;
403 unsigned long b_date
= ((const struct commit_list
*)b
)->item
->date
;
411 static void *commit_list_get_next(const void *a
)
413 return ((const struct commit_list
*)a
)->next
;
416 static void commit_list_set_next(void *a
, void *next
)
418 ((struct commit_list
*)a
)->next
= next
;
421 void commit_list_sort_by_date(struct commit_list
**list
)
423 *list
= llist_mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
424 commit_list_compare_by_date
);
427 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
430 struct commit
*ret
= (*list
)->item
;
431 struct commit_list
*parents
= ret
->parents
;
432 struct commit_list
*old
= *list
;
434 *list
= (*list
)->next
;
438 struct commit
*commit
= parents
->item
;
439 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
440 commit
->object
.flags
|= mark
;
441 commit_list_insert_by_date(commit
, list
);
443 parents
= parents
->next
;
448 static void clear_commit_marks_1(struct commit_list
**plist
,
449 struct commit
*commit
, unsigned int mark
)
452 struct commit_list
*parents
;
454 if (!(mark
& commit
->object
.flags
))
457 commit
->object
.flags
&= ~mark
;
459 parents
= commit
->parents
;
463 while ((parents
= parents
->next
))
464 commit_list_insert(parents
->item
, plist
);
466 commit
= commit
->parents
->item
;
470 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
472 struct commit_list
*list
= NULL
;
473 commit_list_insert(commit
, &list
);
475 clear_commit_marks_1(&list
, pop_commit(&list
), mark
);
478 void clear_commit_marks_for_object_array(struct object_array
*a
, unsigned mark
)
480 struct object
*object
;
481 struct commit
*commit
;
484 for (i
= 0; i
< a
->nr
; i
++) {
485 object
= a
->objects
[i
].item
;
486 commit
= lookup_commit_reference_gently(object
->sha1
, 1);
488 clear_commit_marks(commit
, mark
);
492 struct commit
*pop_commit(struct commit_list
**stack
)
494 struct commit_list
*top
= *stack
;
495 struct commit
*item
= top
? top
->item
: NULL
;
509 static void slab_init(struct commit_slab
*s
)
511 memset(s
, 0, sizeof(*s
));
514 static void slab_clear(struct commit_slab
*s
)
520 static inline int *slab_at(struct commit_slab
*s
, const struct commit
*c
)
522 if (s
->alloc
<= c
->index
) {
523 int new_alloc
= alloc_nr(s
->alloc
);
524 if (new_alloc
<= c
->index
)
525 new_alloc
= c
->index
+ 1;
527 s
->buf
= xrealloc(s
->buf
, new_alloc
* sizeof(*s
->buf
));
528 memset(s
->buf
+ s
->alloc
, 0, new_alloc
- s
->alloc
);
529 s
->alloc
= new_alloc
;
531 return s
->buf
+ c
->index
;
535 * Performs an in-place topological sort on the list supplied.
537 void sort_in_topological_order(struct commit_list
** list
, int lifo
)
539 struct commit_list
*next
, *orig
= *list
;
540 struct commit_list
*work
, **insert
;
541 struct commit_list
**pptr
;
542 struct commit_slab indegree
;
548 slab_init(&indegree
);
550 /* Mark them and clear the indegree */
551 for (next
= orig
; next
; next
= next
->next
) {
552 struct commit
*commit
= next
->item
;
553 *slab_at(&indegree
, commit
) = 1;
556 /* update the indegree */
557 for (next
= orig
; next
; next
= next
->next
) {
558 struct commit_list
* parents
= next
->item
->parents
;
560 struct commit
*parent
= parents
->item
;
561 int *pi
= slab_at(&indegree
, parent
);
565 parents
= parents
->next
;
572 * tips are nodes not reachable from any other node in the list
574 * the tips serve as a starting set for the work queue.
578 for (next
= orig
; next
; next
= next
->next
) {
579 struct commit
*commit
= next
->item
;
581 if (*slab_at(&indegree
, commit
) == 1)
582 insert
= &commit_list_insert(commit
, insert
)->next
;
585 /* process the list in topological order */
587 commit_list_sort_by_date(&work
);
592 struct commit
*commit
;
593 struct commit_list
*parents
, *work_item
;
596 work
= work_item
->next
;
597 work_item
->next
= NULL
;
599 commit
= work_item
->item
;
600 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
601 struct commit
*parent
= parents
->item
;
602 int *pi
= slab_at(&indegree
, parent
);
608 * parents are only enqueued for emission
609 * when all their children have been emitted thereby
610 * guaranteeing topological order.
614 commit_list_insert_by_date(parent
, &work
);
616 commit_list_insert(parent
, &work
);
620 * work_item is a commit all of whose children
621 * have already been emitted. we can emit it now.
623 *slab_at(&indegree
, commit
) = 0;
625 pptr
= &work_item
->next
;
628 slab_clear(&indegree
);
631 /* merge-base stuff */
633 /* bits #0..15 in revision.h */
634 #define PARENT1 (1u<<16)
635 #define PARENT2 (1u<<17)
636 #define STALE (1u<<18)
637 #define RESULT (1u<<19)
639 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
641 static struct commit
*interesting(struct commit_list
*list
)
644 struct commit
*commit
= list
->item
;
646 if (commit
->object
.flags
& STALE
)
653 /* all input commits in one and twos[] must have been parsed! */
654 static struct commit_list
*paint_down_to_common(struct commit
*one
, int n
, struct commit
**twos
)
656 struct commit_list
*list
= NULL
;
657 struct commit_list
*result
= NULL
;
660 one
->object
.flags
|= PARENT1
;
661 commit_list_insert_by_date(one
, &list
);
664 for (i
= 0; i
< n
; i
++) {
665 twos
[i
]->object
.flags
|= PARENT2
;
666 commit_list_insert_by_date(twos
[i
], &list
);
669 while (interesting(list
)) {
670 struct commit
*commit
;
671 struct commit_list
*parents
;
672 struct commit_list
*next
;
680 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
681 if (flags
== (PARENT1
| PARENT2
)) {
682 if (!(commit
->object
.flags
& RESULT
)) {
683 commit
->object
.flags
|= RESULT
;
684 commit_list_insert_by_date(commit
, &result
);
686 /* Mark parents of a found merge stale */
689 parents
= commit
->parents
;
691 struct commit
*p
= parents
->item
;
692 parents
= parents
->next
;
693 if ((p
->object
.flags
& flags
) == flags
)
697 p
->object
.flags
|= flags
;
698 commit_list_insert_by_date(p
, &list
);
702 free_commit_list(list
);
706 static struct commit_list
*merge_bases_many(struct commit
*one
, int n
, struct commit
**twos
)
708 struct commit_list
*list
= NULL
;
709 struct commit_list
*result
= NULL
;
712 for (i
= 0; i
< n
; i
++) {
715 * We do not mark this even with RESULT so we do not
716 * have to clean it up.
718 return commit_list_insert(one
, &result
);
721 if (parse_commit(one
))
723 for (i
= 0; i
< n
; i
++) {
724 if (parse_commit(twos
[i
]))
728 list
= paint_down_to_common(one
, n
, twos
);
731 struct commit_list
*next
= list
->next
;
732 if (!(list
->item
->object
.flags
& STALE
))
733 commit_list_insert_by_date(list
->item
, &result
);
740 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
742 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
743 struct commit_list
**pptr
= &ret
;
745 for (i
= in
; i
; i
= i
->next
) {
747 pptr
= &commit_list_insert(i
->item
, pptr
)->next
;
749 struct commit_list
*new = NULL
, *end
= NULL
;
751 for (j
= ret
; j
; j
= j
->next
) {
752 struct commit_list
*bases
;
753 bases
= get_merge_bases(i
->item
, j
->item
, 1);
758 for (k
= bases
; k
; k
= k
->next
)
767 static int remove_redundant(struct commit
**array
, int cnt
)
770 * Some commit in the array may be an ancestor of
771 * another commit. Move such commit to the end of
772 * the array, and return the number of commits that
773 * are independent from each other.
775 struct commit
**work
;
776 unsigned char *redundant
;
780 work
= xcalloc(cnt
, sizeof(*work
));
781 redundant
= xcalloc(cnt
, 1);
782 filled_index
= xmalloc(sizeof(*filled_index
) * (cnt
- 1));
784 for (i
= 0; i
< cnt
; i
++)
785 parse_commit(array
[i
]);
786 for (i
= 0; i
< cnt
; i
++) {
787 struct commit_list
*common
;
791 for (j
= filled
= 0; j
< cnt
; j
++) {
792 if (i
== j
|| redundant
[j
])
794 filled_index
[filled
] = j
;
795 work
[filled
++] = array
[j
];
797 common
= paint_down_to_common(array
[i
], filled
, work
);
798 if (array
[i
]->object
.flags
& PARENT2
)
800 for (j
= 0; j
< filled
; j
++)
801 if (work
[j
]->object
.flags
& PARENT1
)
802 redundant
[filled_index
[j
]] = 1;
803 clear_commit_marks(array
[i
], all_flags
);
804 for (j
= 0; j
< filled
; j
++)
805 clear_commit_marks(work
[j
], all_flags
);
806 free_commit_list(common
);
809 /* Now collect the result */
810 memcpy(work
, array
, sizeof(*array
) * cnt
);
811 for (i
= filled
= 0; i
< cnt
; i
++)
813 array
[filled
++] = work
[i
];
814 for (j
= filled
, i
= 0; i
< cnt
; i
++)
816 array
[j
++] = work
[i
];
823 struct commit_list
*get_merge_bases_many(struct commit
*one
,
825 struct commit
**twos
,
828 struct commit_list
*list
;
829 struct commit
**rslt
;
830 struct commit_list
*result
;
833 result
= merge_bases_many(one
, n
, twos
);
834 for (i
= 0; i
< n
; i
++) {
838 if (!result
|| !result
->next
) {
840 clear_commit_marks(one
, all_flags
);
841 for (i
= 0; i
< n
; i
++)
842 clear_commit_marks(twos
[i
], all_flags
);
847 /* There are more than one */
854 rslt
= xcalloc(cnt
, sizeof(*rslt
));
855 for (list
= result
, i
= 0; list
; list
= list
->next
)
856 rslt
[i
++] = list
->item
;
857 free_commit_list(result
);
859 clear_commit_marks(one
, all_flags
);
860 for (i
= 0; i
< n
; i
++)
861 clear_commit_marks(twos
[i
], all_flags
);
863 cnt
= remove_redundant(rslt
, cnt
);
865 for (i
= 0; i
< cnt
; i
++)
866 commit_list_insert_by_date(rslt
[i
], &result
);
871 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
,
874 return get_merge_bases_many(one
, 1, &two
, cleanup
);
878 * Is "commit" a descendant of one of the elements on the "with_commit" list?
880 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
884 while (with_commit
) {
885 struct commit
*other
;
887 other
= with_commit
->item
;
888 with_commit
= with_commit
->next
;
889 if (in_merge_bases(other
, commit
))
896 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
898 int in_merge_bases(struct commit
*commit
, struct commit
*reference
)
900 struct commit_list
*bases
;
903 if (parse_commit(commit
) || parse_commit(reference
))
906 bases
= paint_down_to_common(commit
, 1, &reference
);
907 if (commit
->object
.flags
& PARENT2
)
909 clear_commit_marks(commit
, all_flags
);
910 clear_commit_marks(reference
, all_flags
);
911 free_commit_list(bases
);
915 struct commit_list
*reduce_heads(struct commit_list
*heads
)
917 struct commit_list
*p
;
918 struct commit_list
*result
= NULL
, **tail
= &result
;
919 struct commit
**array
;
926 for (p
= heads
; p
; p
= p
->next
)
927 p
->item
->object
.flags
&= ~STALE
;
928 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
929 if (p
->item
->object
.flags
& STALE
)
931 p
->item
->object
.flags
|= STALE
;
934 array
= xcalloc(sizeof(*array
), num_head
);
935 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
936 if (p
->item
->object
.flags
& STALE
) {
937 array
[i
++] = p
->item
;
938 p
->item
->object
.flags
&= ~STALE
;
941 num_head
= remove_redundant(array
, num_head
);
942 for (i
= 0; i
< num_head
; i
++)
943 tail
= &commit_list_insert(array
[i
], tail
)->next
;
947 static const char gpg_sig_header
[] = "gpgsig";
948 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
950 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
952 struct strbuf sig
= STRBUF_INIT
;
955 /* find the end of the header */
956 inspos
= strstr(buf
->buf
, "\n\n") - buf
->buf
+ 1;
958 if (!keyid
|| !*keyid
)
959 keyid
= get_signing_key();
960 if (sign_buffer(buf
, &sig
, keyid
)) {
961 strbuf_release(&sig
);
965 for (copypos
= 0; sig
.buf
[copypos
]; ) {
966 const char *bol
= sig
.buf
+ copypos
;
967 const char *eol
= strchrnul(bol
, '\n');
968 int len
= (eol
- bol
) + !!*eol
;
971 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
972 inspos
+= gpg_sig_header_len
;
974 strbuf_insert(buf
, inspos
++, " ", 1);
975 strbuf_insert(buf
, inspos
, bol
, len
);
979 strbuf_release(&sig
);
983 int parse_signed_commit(const unsigned char *sha1
,
984 struct strbuf
*payload
, struct strbuf
*signature
)
987 enum object_type type
;
988 char *buffer
= read_sha1_file(sha1
, &type
, &size
);
989 int in_signature
, saw_signature
= -1;
992 if (!buffer
|| type
!= OBJ_COMMIT
)
996 tail
= buffer
+ size
;
999 while (line
< tail
) {
1000 const char *sig
= NULL
;
1001 char *next
= memchr(line
, '\n', tail
- line
);
1003 next
= next
? next
+ 1 : tail
;
1004 if (in_signature
&& line
[0] == ' ')
1006 else if (!prefixcmp(line
, gpg_sig_header
) &&
1007 line
[gpg_sig_header_len
] == ' ')
1008 sig
= line
+ gpg_sig_header_len
+ 1;
1010 strbuf_add(signature
, sig
, next
- sig
);
1015 /* dump the whole remainder of the buffer */
1017 strbuf_add(payload
, line
, next
- line
);
1024 return saw_signature
;
1027 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
1029 struct merge_remote_desc
*desc
;
1030 struct commit_extra_header
*mergetag
;
1032 unsigned long size
, len
;
1033 enum object_type type
;
1035 desc
= merge_remote_util(parent
);
1036 if (!desc
|| !desc
->obj
)
1038 buf
= read_sha1_file(desc
->obj
->sha1
, &type
, &size
);
1039 if (!buf
|| type
!= OBJ_TAG
)
1041 len
= parse_signature(buf
, size
);
1045 * We could verify this signature and either omit the tag when
1046 * it does not validate, but the integrator may not have the
1047 * public key of the signer of the tag he is merging, while a
1048 * later auditor may have it while auditing, so let's not run
1049 * verify-signed-buffer here for now...
1051 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1052 * warn("warning: signed tag unverified.");
1054 mergetag
= xcalloc(1, sizeof(*mergetag
));
1055 mergetag
->key
= xstrdup("mergetag");
1056 mergetag
->value
= buf
;
1057 mergetag
->len
= size
;
1060 *tail
= &mergetag
->next
;
1067 void append_merge_tag_headers(struct commit_list
*parents
,
1068 struct commit_extra_header
***tail
)
1071 struct commit
*parent
= parents
->item
;
1072 handle_signed_tag(parent
, tail
);
1073 parents
= parents
->next
;
1077 static void add_extra_header(struct strbuf
*buffer
,
1078 struct commit_extra_header
*extra
)
1080 strbuf_addstr(buffer
, extra
->key
);
1082 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1084 strbuf_addch(buffer
, '\n');
1087 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1088 const char **exclude
)
1090 struct commit_extra_header
*extra
= NULL
;
1092 enum object_type type
;
1093 char *buffer
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
1094 if (buffer
&& type
== OBJ_COMMIT
)
1095 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1100 static inline int standard_header_field(const char *field
, size_t len
)
1102 return ((len
== 4 && !memcmp(field
, "tree ", 5)) ||
1103 (len
== 6 && !memcmp(field
, "parent ", 7)) ||
1104 (len
== 6 && !memcmp(field
, "author ", 7)) ||
1105 (len
== 9 && !memcmp(field
, "committer ", 10)) ||
1106 (len
== 8 && !memcmp(field
, "encoding ", 9)));
1109 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1115 size_t xlen
= strlen(*exclude
);
1117 !memcmp(field
, *exclude
, xlen
) && field
[xlen
] == ' ')
1124 static struct commit_extra_header
*read_commit_extra_header_lines(
1125 const char *buffer
, size_t size
,
1126 const char **exclude
)
1128 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1129 const char *line
, *next
, *eof
, *eob
;
1130 struct strbuf buf
= STRBUF_INIT
;
1132 for (line
= buffer
, eob
= line
+ size
;
1133 line
< eob
&& *line
!= '\n';
1135 next
= memchr(line
, '\n', eob
- line
);
1136 next
= next
? next
+ 1 : eob
;
1140 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1144 it
->value
= strbuf_detach(&buf
, &it
->len
);
1148 eof
= strchr(line
, ' ');
1152 if (standard_header_field(line
, eof
- line
) ||
1153 excluded_header_field(line
, eof
- line
, exclude
))
1156 it
= xcalloc(1, sizeof(*it
));
1157 it
->key
= xmemdupz(line
, eof
-line
);
1161 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1164 it
->value
= strbuf_detach(&buf
, &it
->len
);
1168 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1171 struct commit_extra_header
*next
= extra
->next
;
1179 int commit_tree(const struct strbuf
*msg
, unsigned char *tree
,
1180 struct commit_list
*parents
, unsigned char *ret
,
1181 const char *author
, const char *sign_commit
)
1183 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1186 append_merge_tag_headers(parents
, &tail
);
1187 result
= commit_tree_extended(msg
, tree
, parents
, ret
,
1188 author
, sign_commit
, extra
);
1189 free_commit_extra_headers(extra
);
1193 static int find_invalid_utf8(const char *buf
, int len
)
1198 unsigned char c
= *buf
++;
1199 int bytes
, bad_offset
;
1204 /* Simple US-ASCII? No worries. */
1208 bad_offset
= offset
-1;
1211 * Count how many more high bits set: that's how
1212 * many more bytes this sequence should have.
1220 /* Must be between 1 and 5 more bytes */
1221 if (bytes
< 1 || bytes
> 5)
1224 /* Do we *have* that many bytes? */
1231 /* And verify that they are good continuation bytes */
1233 if ((*buf
++ & 0xc0) != 0x80)
1237 /* We could/should check the value and length here too */
1243 * This verifies that the buffer is in proper utf8 format.
1245 * If it isn't, it assumes any non-utf8 characters are Latin1,
1246 * and does the conversion.
1248 * Fixme: we should probably also disallow overlong forms and
1249 * invalid characters. But we don't do that currently.
1251 static int verify_utf8(struct strbuf
*buf
)
1259 unsigned char replace
[2];
1261 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1267 strbuf_remove(buf
, pos
, 1);
1269 /* We know 'c' must be in the range 128-255 */
1270 replace
[0] = 0xc0 + (c
>> 6);
1271 replace
[1] = 0x80 + (c
& 0x3f);
1272 strbuf_insert(buf
, pos
, replace
, 2);
1277 static const char commit_utf8_warn
[] =
1278 "Warning: commit message did not conform to UTF-8.\n"
1279 "You may want to amend it after fixing the message, or set the config\n"
1280 "variable i18n.commitencoding to the encoding your project uses.\n";
1282 int commit_tree_extended(const struct strbuf
*msg
, unsigned char *tree
,
1283 struct commit_list
*parents
, unsigned char *ret
,
1284 const char *author
, const char *sign_commit
,
1285 struct commit_extra_header
*extra
)
1288 int encoding_is_utf8
;
1289 struct strbuf buffer
;
1291 assert_sha1_type(tree
, OBJ_TREE
);
1293 if (memchr(msg
->buf
, '\0', msg
->len
))
1294 return error("a NUL byte in commit log message not allowed.");
1296 /* Not having i18n.commitencoding is the same as having utf-8 */
1297 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1299 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1300 strbuf_addf(&buffer
, "tree %s\n", sha1_to_hex(tree
));
1303 * NOTE! This ordering means that the same exact tree merged with a
1304 * different order of parents will be a _different_ changeset even
1305 * if everything else stays the same.
1308 struct commit_list
*next
= parents
->next
;
1309 struct commit
*parent
= parents
->item
;
1311 strbuf_addf(&buffer
, "parent %s\n",
1312 sha1_to_hex(parent
->object
.sha1
));
1317 /* Person/date information */
1319 author
= git_author_info(IDENT_STRICT
);
1320 strbuf_addf(&buffer
, "author %s\n", author
);
1321 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_STRICT
));
1322 if (!encoding_is_utf8
)
1323 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1326 add_extra_header(&buffer
, extra
);
1327 extra
= extra
->next
;
1329 strbuf_addch(&buffer
, '\n');
1331 /* And add the comment */
1332 strbuf_addbuf(&buffer
, msg
);
1334 /* And check the encoding */
1335 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1336 fprintf(stderr
, commit_utf8_warn
);
1338 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
))
1341 result
= write_sha1_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1342 strbuf_release(&buffer
);
1346 struct commit
*get_merge_parent(const char *name
)
1349 struct commit
*commit
;
1350 unsigned char sha1
[20];
1351 if (get_sha1(name
, sha1
))
1353 obj
= parse_object(sha1
);
1354 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1355 if (commit
&& !commit
->util
) {
1356 struct merge_remote_desc
*desc
;
1357 desc
= xmalloc(sizeof(*desc
));
1359 desc
->name
= strdup(name
);
1360 commit
->util
= desc
;
1366 * Append a commit to the end of the commit_list.
1368 * next starts by pointing to the variable that holds the head of an
1369 * empty commit_list, and is updated to point to the "next" field of
1370 * the last item on the list as new commits are appended.
1374 * struct commit_list *list;
1375 * struct commit_list **next = &list;
1377 * next = commit_list_append(c1, next);
1378 * next = commit_list_append(c2, next);
1379 * assert(commit_list_count(list) == 2);
1382 struct commit_list
**commit_list_append(struct commit
*commit
,
1383 struct commit_list
**next
)
1385 struct commit_list
*new = xmalloc(sizeof(struct commit_list
));
1392 void print_commit_list(struct commit_list
*list
,
1393 const char *format_cur
,
1394 const char *format_last
)
1396 for ( ; list
; list
= list
->next
) {
1397 const char *format
= list
->next
? format_cur
: format_last
;
1398 printf(format
, sha1_to_hex(list
->item
->object
.sha1
));