9 #include "gpg-interface.h"
10 #include "mergesort.h"
12 int save_commit_buffer
= 1;
14 const char *commit_type
= "commit";
16 static struct commit
*check_commit(struct object
*obj
,
17 const unsigned char *sha1
,
20 if (obj
->type
!= OBJ_COMMIT
) {
22 error("Object %s is a %s, not a commit",
23 sha1_to_hex(sha1
), typename(obj
->type
));
26 return (struct commit
*) obj
;
29 struct commit
*lookup_commit_reference_gently(const unsigned char *sha1
,
32 struct object
*obj
= deref_tag(parse_object(sha1
), NULL
, 0);
36 return check_commit(obj
, sha1
, quiet
);
39 struct commit
*lookup_commit_reference(const unsigned char *sha1
)
41 return lookup_commit_reference_gently(sha1
, 0);
44 struct commit
*lookup_commit_or_die(const unsigned char *sha1
, const char *ref_name
)
46 struct commit
*c
= lookup_commit_reference(sha1
);
48 die(_("could not parse %s"), ref_name
);
49 if (hashcmp(sha1
, c
->object
.sha1
)) {
50 warning(_("%s %s is not a commit!"),
51 ref_name
, sha1_to_hex(sha1
));
56 struct commit
*lookup_commit(const unsigned char *sha1
)
58 struct object
*obj
= lookup_object(sha1
);
60 return create_object(sha1
, OBJ_COMMIT
, alloc_commit_node());
62 obj
->type
= OBJ_COMMIT
;
63 return check_commit(obj
, sha1
, 0);
66 struct commit
*lookup_commit_reference_by_name(const char *name
)
68 unsigned char sha1
[20];
69 struct commit
*commit
;
71 if (get_sha1(name
, sha1
))
73 commit
= lookup_commit_reference(sha1
);
74 if (!commit
|| parse_commit(commit
))
79 static unsigned long parse_commit_date(const char *buf
, const char *tail
)
85 if (memcmp(buf
, "author", 6))
87 while (buf
< tail
&& *buf
++ != '\n')
91 if (memcmp(buf
, "committer", 9))
93 while (buf
< tail
&& *buf
++ != '>')
98 while (buf
< tail
&& *buf
++ != '\n')
102 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
103 return strtoul(dateptr
, NULL
, 10);
106 static struct commit_graft
**commit_graft
;
107 static int commit_graft_alloc
, commit_graft_nr
;
109 static int commit_graft_pos(const unsigned char *sha1
)
113 hi
= commit_graft_nr
;
115 int mi
= (lo
+ hi
) / 2;
116 struct commit_graft
*graft
= commit_graft
[mi
];
117 int cmp
= hashcmp(sha1
, graft
->sha1
);
128 int register_commit_graft(struct commit_graft
*graft
, int ignore_dups
)
130 int pos
= commit_graft_pos(graft
->sha1
);
136 free(commit_graft
[pos
]);
137 commit_graft
[pos
] = graft
;
142 if (commit_graft_alloc
<= ++commit_graft_nr
) {
143 commit_graft_alloc
= alloc_nr(commit_graft_alloc
);
144 commit_graft
= xrealloc(commit_graft
,
145 sizeof(*commit_graft
) *
148 if (pos
< commit_graft_nr
)
149 memmove(commit_graft
+ pos
+ 1,
151 (commit_graft_nr
- pos
- 1) *
152 sizeof(*commit_graft
));
153 commit_graft
[pos
] = graft
;
157 struct commit_graft
*read_graft_line(char *buf
, int len
)
159 /* The format is just "Commit Parent1 Parent2 ...\n" */
161 struct commit_graft
*graft
= NULL
;
163 while (len
&& isspace(buf
[len
-1]))
165 if (buf
[0] == '#' || buf
[0] == '\0')
169 i
= (len
+ 1) / 41 - 1;
170 graft
= xmalloc(sizeof(*graft
) + 20 * i
);
171 graft
->nr_parent
= i
;
172 if (get_sha1_hex(buf
, graft
->sha1
))
174 for (i
= 40; i
< len
; i
+= 41) {
177 if (get_sha1_hex(buf
+ i
+ 1, graft
->parent
[i
/41]))
183 error("bad graft data: %s", buf
);
188 static int read_graft_file(const char *graft_file
)
190 FILE *fp
= fopen(graft_file
, "r");
194 while (fgets(buf
, sizeof(buf
), fp
)) {
195 /* The format is just "Commit Parent1 Parent2 ...\n" */
196 int len
= strlen(buf
);
197 struct commit_graft
*graft
= read_graft_line(buf
, len
);
200 if (register_commit_graft(graft
, 1))
201 error("duplicate graft data: %s", buf
);
207 static void prepare_commit_graft(void)
209 static int commit_graft_prepared
;
212 if (commit_graft_prepared
)
214 graft_file
= get_graft_file();
215 read_graft_file(graft_file
);
216 /* make sure shallows are read */
217 is_repository_shallow();
218 commit_graft_prepared
= 1;
221 struct commit_graft
*lookup_commit_graft(const unsigned char *sha1
)
224 prepare_commit_graft();
225 pos
= commit_graft_pos(sha1
);
228 return commit_graft
[pos
];
231 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
234 for (i
= ret
= 0; i
< commit_graft_nr
&& !ret
; i
++)
235 ret
= fn(commit_graft
[i
], cb_data
);
239 int unregister_shallow(const unsigned char *sha1
)
241 int pos
= commit_graft_pos(sha1
);
244 if (pos
+ 1 < commit_graft_nr
)
245 memmove(commit_graft
+ pos
, commit_graft
+ pos
+ 1,
246 sizeof(struct commit_graft
*)
247 * (commit_graft_nr
- pos
- 1));
252 int parse_commit_buffer(struct commit
*item
, const void *buffer
, unsigned long size
)
254 const char *tail
= buffer
;
255 const char *bufptr
= buffer
;
256 unsigned char parent
[20];
257 struct commit_list
**pptr
;
258 struct commit_graft
*graft
;
260 if (item
->object
.parsed
)
262 item
->object
.parsed
= 1;
264 if (tail
<= bufptr
+ 46 || memcmp(bufptr
, "tree ", 5) || bufptr
[45] != '\n')
265 return error("bogus commit object %s", sha1_to_hex(item
->object
.sha1
));
266 if (get_sha1_hex(bufptr
+ 5, parent
) < 0)
267 return error("bad tree pointer in commit %s",
268 sha1_to_hex(item
->object
.sha1
));
269 item
->tree
= lookup_tree(parent
);
270 bufptr
+= 46; /* "tree " + "hex sha1" + "\n" */
271 pptr
= &item
->parents
;
273 graft
= lookup_commit_graft(item
->object
.sha1
);
274 while (bufptr
+ 48 < tail
&& !memcmp(bufptr
, "parent ", 7)) {
275 struct commit
*new_parent
;
277 if (tail
<= bufptr
+ 48 ||
278 get_sha1_hex(bufptr
+ 7, parent
) ||
280 return error("bad parents in commit %s", sha1_to_hex(item
->object
.sha1
));
283 * The clone is shallow if nr_parent < 0, and we must
284 * not traverse its real parents even when we unhide them.
286 if (graft
&& (graft
->nr_parent
< 0 || grafts_replace_parents
))
288 new_parent
= lookup_commit(parent
);
290 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
294 struct commit
*new_parent
;
295 for (i
= 0; i
< graft
->nr_parent
; i
++) {
296 new_parent
= lookup_commit(graft
->parent
[i
]);
299 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
302 item
->date
= parse_commit_date(bufptr
, tail
);
307 int parse_commit(struct commit
*item
)
309 enum object_type type
;
316 if (item
->object
.parsed
)
318 buffer
= read_sha1_file(item
->object
.sha1
, &type
, &size
);
320 return error("Could not read %s",
321 sha1_to_hex(item
->object
.sha1
));
322 if (type
!= OBJ_COMMIT
) {
324 return error("Object %s not a commit",
325 sha1_to_hex(item
->object
.sha1
));
327 ret
= parse_commit_buffer(item
, buffer
, size
);
328 if (save_commit_buffer
&& !ret
) {
329 item
->buffer
= buffer
;
336 int find_commit_subject(const char *commit_buffer
, const char **subject
)
339 const char *p
= commit_buffer
;
341 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
345 for (eol
= p
; *eol
&& *eol
!= '\n'; eol
++)
355 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
357 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
358 new_list
->item
= item
;
359 new_list
->next
= *list_p
;
364 unsigned commit_list_count(const struct commit_list
*l
)
367 for (; l
; l
= l
->next
)
372 void free_commit_list(struct commit_list
*list
)
375 struct commit_list
*temp
= list
;
381 struct commit_list
* commit_list_insert_by_date(struct commit
*item
, struct commit_list
**list
)
383 struct commit_list
**pp
= list
;
384 struct commit_list
*p
;
385 while ((p
= *pp
) != NULL
) {
386 if (p
->item
->date
< item
->date
) {
391 return commit_list_insert(item
, pp
);
394 static int commit_list_compare_by_date(const void *a
, const void *b
)
396 unsigned long a_date
= ((const struct commit_list
*)a
)->item
->date
;
397 unsigned long b_date
= ((const struct commit_list
*)b
)->item
->date
;
405 static void *commit_list_get_next(const void *a
)
407 return ((const struct commit_list
*)a
)->next
;
410 static void commit_list_set_next(void *a
, void *next
)
412 ((struct commit_list
*)a
)->next
= next
;
415 void commit_list_sort_by_date(struct commit_list
**list
)
417 *list
= mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
418 commit_list_compare_by_date
);
421 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
424 struct commit
*ret
= (*list
)->item
;
425 struct commit_list
*parents
= ret
->parents
;
426 struct commit_list
*old
= *list
;
428 *list
= (*list
)->next
;
432 struct commit
*commit
= parents
->item
;
433 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
434 commit
->object
.flags
|= mark
;
435 commit_list_insert_by_date(commit
, list
);
437 parents
= parents
->next
;
442 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
445 struct commit_list
*parents
;
447 if (!(mark
& commit
->object
.flags
))
450 commit
->object
.flags
&= ~mark
;
452 parents
= commit
->parents
;
456 while ((parents
= parents
->next
))
457 clear_commit_marks(parents
->item
, mark
);
459 commit
= commit
->parents
->item
;
463 void clear_commit_marks_for_object_array(struct object_array
*a
, unsigned mark
)
465 struct object
*object
;
466 struct commit
*commit
;
469 for (i
= 0; i
< a
->nr
; i
++) {
470 object
= a
->objects
[i
].item
;
471 commit
= lookup_commit_reference_gently(object
->sha1
, 1);
473 clear_commit_marks(commit
, mark
);
477 struct commit
*pop_commit(struct commit_list
**stack
)
479 struct commit_list
*top
= *stack
;
480 struct commit
*item
= top
? top
->item
: NULL
;
490 * Performs an in-place topological sort on the list supplied.
492 void sort_in_topological_order(struct commit_list
** list
, int lifo
)
494 struct commit_list
*next
, *orig
= *list
;
495 struct commit_list
*work
, **insert
;
496 struct commit_list
**pptr
;
502 /* Mark them and clear the indegree */
503 for (next
= orig
; next
; next
= next
->next
) {
504 struct commit
*commit
= next
->item
;
505 commit
->indegree
= 1;
508 /* update the indegree */
509 for (next
= orig
; next
; next
= next
->next
) {
510 struct commit_list
* parents
= next
->item
->parents
;
512 struct commit
*parent
= parents
->item
;
514 if (parent
->indegree
)
516 parents
= parents
->next
;
523 * tips are nodes not reachable from any other node in the list
525 * the tips serve as a starting set for the work queue.
529 for (next
= orig
; next
; next
= next
->next
) {
530 struct commit
*commit
= next
->item
;
532 if (commit
->indegree
== 1)
533 insert
= &commit_list_insert(commit
, insert
)->next
;
536 /* process the list in topological order */
538 commit_list_sort_by_date(&work
);
543 struct commit
*commit
;
544 struct commit_list
*parents
, *work_item
;
547 work
= work_item
->next
;
548 work_item
->next
= NULL
;
550 commit
= work_item
->item
;
551 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
552 struct commit
*parent
= parents
->item
;
554 if (!parent
->indegree
)
558 * parents are only enqueued for emission
559 * when all their children have been emitted thereby
560 * guaranteeing topological order.
562 if (--parent
->indegree
== 1) {
564 commit_list_insert_by_date(parent
, &work
);
566 commit_list_insert(parent
, &work
);
570 * work_item is a commit all of whose children
571 * have already been emitted. we can emit it now.
573 commit
->indegree
= 0;
575 pptr
= &work_item
->next
;
579 /* merge-base stuff */
581 /* bits #0..15 in revision.h */
582 #define PARENT1 (1u<<16)
583 #define PARENT2 (1u<<17)
584 #define STALE (1u<<18)
585 #define RESULT (1u<<19)
587 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
589 static struct commit
*interesting(struct commit_list
*list
)
592 struct commit
*commit
= list
->item
;
594 if (commit
->object
.flags
& STALE
)
601 static struct commit_list
*merge_bases_many(struct commit
*one
, int n
, struct commit
**twos
)
603 struct commit_list
*list
= NULL
;
604 struct commit_list
*result
= NULL
;
607 for (i
= 0; i
< n
; i
++) {
610 * We do not mark this even with RESULT so we do not
611 * have to clean it up.
613 return commit_list_insert(one
, &result
);
616 if (parse_commit(one
))
618 for (i
= 0; i
< n
; i
++) {
619 if (parse_commit(twos
[i
]))
623 one
->object
.flags
|= PARENT1
;
624 commit_list_insert_by_date(one
, &list
);
625 for (i
= 0; i
< n
; i
++) {
626 twos
[i
]->object
.flags
|= PARENT2
;
627 commit_list_insert_by_date(twos
[i
], &list
);
630 while (interesting(list
)) {
631 struct commit
*commit
;
632 struct commit_list
*parents
;
633 struct commit_list
*next
;
641 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
642 if (flags
== (PARENT1
| PARENT2
)) {
643 if (!(commit
->object
.flags
& RESULT
)) {
644 commit
->object
.flags
|= RESULT
;
645 commit_list_insert_by_date(commit
, &result
);
647 /* Mark parents of a found merge stale */
650 parents
= commit
->parents
;
652 struct commit
*p
= parents
->item
;
653 parents
= parents
->next
;
654 if ((p
->object
.flags
& flags
) == flags
)
658 p
->object
.flags
|= flags
;
659 commit_list_insert_by_date(p
, &list
);
663 /* Clean up the result to remove stale ones */
664 free_commit_list(list
);
665 list
= result
; result
= NULL
;
667 struct commit_list
*next
= list
->next
;
668 if (!(list
->item
->object
.flags
& STALE
))
669 commit_list_insert_by_date(list
->item
, &result
);
676 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
678 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
679 struct commit_list
**pptr
= &ret
;
681 for (i
= in
; i
; i
= i
->next
) {
683 pptr
= &commit_list_insert(i
->item
, pptr
)->next
;
685 struct commit_list
*new = NULL
, *end
= NULL
;
687 for (j
= ret
; j
; j
= j
->next
) {
688 struct commit_list
*bases
;
689 bases
= get_merge_bases(i
->item
, j
->item
, 1);
694 for (k
= bases
; k
; k
= k
->next
)
703 struct commit_list
*get_merge_bases_many(struct commit
*one
,
705 struct commit
**twos
,
708 struct commit_list
*list
;
709 struct commit
**rslt
;
710 struct commit_list
*result
;
713 result
= merge_bases_many(one
, n
, twos
);
714 for (i
= 0; i
< n
; i
++) {
718 if (!result
|| !result
->next
) {
720 clear_commit_marks(one
, all_flags
);
721 for (i
= 0; i
< n
; i
++)
722 clear_commit_marks(twos
[i
], all_flags
);
727 /* There are more than one */
734 rslt
= xcalloc(cnt
, sizeof(*rslt
));
735 for (list
= result
, i
= 0; list
; list
= list
->next
)
736 rslt
[i
++] = list
->item
;
737 free_commit_list(result
);
739 clear_commit_marks(one
, all_flags
);
740 for (i
= 0; i
< n
; i
++)
741 clear_commit_marks(twos
[i
], all_flags
);
742 for (i
= 0; i
< cnt
- 1; i
++) {
743 for (j
= i
+1; j
< cnt
; j
++) {
744 if (!rslt
[i
] || !rslt
[j
])
746 result
= merge_bases_many(rslt
[i
], 1, &rslt
[j
]);
747 clear_commit_marks(rslt
[i
], all_flags
);
748 clear_commit_marks(rslt
[j
], all_flags
);
749 for (list
= result
; list
; list
= list
->next
) {
750 if (rslt
[i
] == list
->item
)
752 if (rslt
[j
] == list
->item
)
758 /* Surviving ones in rslt[] are the independent results */
760 for (i
= 0; i
< cnt
; i
++) {
762 commit_list_insert_by_date(rslt
[i
], &result
);
768 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
,
771 return get_merge_bases_many(one
, 1, &two
, cleanup
);
774 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
778 while (with_commit
) {
779 struct commit
*other
;
781 other
= with_commit
->item
;
782 with_commit
= with_commit
->next
;
783 if (in_merge_bases(other
, &commit
, 1))
789 int in_merge_bases(struct commit
*commit
, struct commit
**reference
, int num
)
791 struct commit_list
*bases
, *b
;
795 bases
= get_merge_bases(commit
, *reference
, 1);
798 for (b
= bases
; b
; b
= b
->next
) {
799 if (!hashcmp(commit
->object
.sha1
, b
->item
->object
.sha1
)) {
805 free_commit_list(bases
);
809 struct commit_list
*reduce_heads(struct commit_list
*heads
)
811 struct commit_list
*p
;
812 struct commit_list
*result
= NULL
, **tail
= &result
;
813 struct commit
**other
;
814 size_t num_head
, num_other
;
819 /* Avoid unnecessary reallocations */
820 for (p
= heads
, num_head
= 0; p
; p
= p
->next
)
822 other
= xcalloc(sizeof(*other
), num_head
);
824 /* For each commit, see if it can be reached by others */
825 for (p
= heads
; p
; p
= p
->next
) {
826 struct commit_list
*q
, *base
;
828 /* Do we already have this in the result? */
829 for (q
= result
; q
; q
= q
->next
)
830 if (p
->item
== q
->item
)
836 for (q
= heads
; q
; q
= q
->next
) {
837 if (p
->item
== q
->item
)
839 other
[num_other
++] = q
->item
;
842 base
= get_merge_bases_many(p
->item
, num_other
, other
, 1);
846 * If p->item does not have anything common with other
847 * commits, there won't be any merge base. If it is
848 * reachable from some of the others, p->item will be
849 * the merge base. If its history is connected with
850 * others, but p->item is not reachable by others, we
851 * will get something other than p->item back.
853 if (!base
|| (base
->item
!= p
->item
))
854 tail
= &(commit_list_insert(p
->item
, tail
)->next
);
855 free_commit_list(base
);
861 static const char gpg_sig_header
[] = "gpgsig";
862 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
864 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
866 struct strbuf sig
= STRBUF_INIT
;
869 /* find the end of the header */
870 inspos
= strstr(buf
->buf
, "\n\n") - buf
->buf
+ 1;
872 if (!keyid
|| !*keyid
)
873 keyid
= get_signing_key();
874 if (sign_buffer(buf
, &sig
, keyid
)) {
875 strbuf_release(&sig
);
879 for (copypos
= 0; sig
.buf
[copypos
]; ) {
880 const char *bol
= sig
.buf
+ copypos
;
881 const char *eol
= strchrnul(bol
, '\n');
882 int len
= (eol
- bol
) + !!*eol
;
885 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
886 inspos
+= gpg_sig_header_len
;
888 strbuf_insert(buf
, inspos
++, " ", 1);
889 strbuf_insert(buf
, inspos
, bol
, len
);
893 strbuf_release(&sig
);
897 int parse_signed_commit(const unsigned char *sha1
,
898 struct strbuf
*payload
, struct strbuf
*signature
)
901 enum object_type type
;
902 char *buffer
= read_sha1_file(sha1
, &type
, &size
);
903 int in_signature
, saw_signature
= -1;
906 if (!buffer
|| type
!= OBJ_COMMIT
)
910 tail
= buffer
+ size
;
913 while (line
< tail
) {
914 const char *sig
= NULL
;
915 char *next
= memchr(line
, '\n', tail
- line
);
917 next
= next
? next
+ 1 : tail
;
918 if (in_signature
&& line
[0] == ' ')
920 else if (!prefixcmp(line
, gpg_sig_header
) &&
921 line
[gpg_sig_header_len
] == ' ')
922 sig
= line
+ gpg_sig_header_len
+ 1;
924 strbuf_add(signature
, sig
, next
- sig
);
929 /* dump the whole remainder of the buffer */
931 strbuf_add(payload
, line
, next
- line
);
938 return saw_signature
;
941 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
943 struct merge_remote_desc
*desc
;
944 struct commit_extra_header
*mergetag
;
946 unsigned long size
, len
;
947 enum object_type type
;
949 desc
= merge_remote_util(parent
);
950 if (!desc
|| !desc
->obj
)
952 buf
= read_sha1_file(desc
->obj
->sha1
, &type
, &size
);
953 if (!buf
|| type
!= OBJ_TAG
)
955 len
= parse_signature(buf
, size
);
959 * We could verify this signature and either omit the tag when
960 * it does not validate, but the integrator may not have the
961 * public key of the signer of the tag he is merging, while a
962 * later auditor may have it while auditing, so let's not run
963 * verify-signed-buffer here for now...
965 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
966 * warn("warning: signed tag unverified.");
968 mergetag
= xcalloc(1, sizeof(*mergetag
));
969 mergetag
->key
= xstrdup("mergetag");
970 mergetag
->value
= buf
;
971 mergetag
->len
= size
;
974 *tail
= &mergetag
->next
;
981 void append_merge_tag_headers(struct commit_list
*parents
,
982 struct commit_extra_header
***tail
)
985 struct commit
*parent
= parents
->item
;
986 handle_signed_tag(parent
, tail
);
987 parents
= parents
->next
;
991 static void add_extra_header(struct strbuf
*buffer
,
992 struct commit_extra_header
*extra
)
994 strbuf_addstr(buffer
, extra
->key
);
996 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
998 strbuf_addch(buffer
, '\n');
1001 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1002 const char **exclude
)
1004 struct commit_extra_header
*extra
= NULL
;
1006 enum object_type type
;
1007 char *buffer
= read_sha1_file(commit
->object
.sha1
, &type
, &size
);
1008 if (buffer
&& type
== OBJ_COMMIT
)
1009 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1014 static inline int standard_header_field(const char *field
, size_t len
)
1016 return ((len
== 4 && !memcmp(field
, "tree ", 5)) ||
1017 (len
== 6 && !memcmp(field
, "parent ", 7)) ||
1018 (len
== 6 && !memcmp(field
, "author ", 7)) ||
1019 (len
== 9 && !memcmp(field
, "committer ", 10)) ||
1020 (len
== 8 && !memcmp(field
, "encoding ", 9)));
1023 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1029 size_t xlen
= strlen(*exclude
);
1031 !memcmp(field
, *exclude
, xlen
) && field
[xlen
] == ' ')
1038 struct commit_extra_header
*read_commit_extra_header_lines(const char *buffer
, size_t size
,
1039 const char **exclude
)
1041 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1042 const char *line
, *next
, *eof
, *eob
;
1043 struct strbuf buf
= STRBUF_INIT
;
1045 for (line
= buffer
, eob
= line
+ size
;
1046 line
< eob
&& *line
!= '\n';
1048 next
= memchr(line
, '\n', eob
- line
);
1049 next
= next
? next
+ 1 : eob
;
1053 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1057 it
->value
= strbuf_detach(&buf
, &it
->len
);
1061 eof
= strchr(line
, ' ');
1065 if (standard_header_field(line
, eof
- line
) ||
1066 excluded_header_field(line
, eof
- line
, exclude
))
1069 it
= xcalloc(1, sizeof(*it
));
1070 it
->key
= xmemdupz(line
, eof
-line
);
1074 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1077 it
->value
= strbuf_detach(&buf
, &it
->len
);
1081 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1084 struct commit_extra_header
*next
= extra
->next
;
1092 int commit_tree(const struct strbuf
*msg
, unsigned char *tree
,
1093 struct commit_list
*parents
, unsigned char *ret
,
1094 const char *author
, const char *sign_commit
)
1096 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1099 append_merge_tag_headers(parents
, &tail
);
1100 result
= commit_tree_extended(msg
, tree
, parents
, ret
,
1101 author
, sign_commit
, extra
);
1102 free_commit_extra_headers(extra
);
1106 static const char commit_utf8_warn
[] =
1107 "Warning: commit message does not conform to UTF-8.\n"
1108 "You may want to amend it after fixing the message, or set the config\n"
1109 "variable i18n.commitencoding to the encoding your project uses.\n";
1111 int commit_tree_extended(const struct strbuf
*msg
, unsigned char *tree
,
1112 struct commit_list
*parents
, unsigned char *ret
,
1113 const char *author
, const char *sign_commit
,
1114 struct commit_extra_header
*extra
)
1117 int encoding_is_utf8
;
1118 struct strbuf buffer
;
1120 assert_sha1_type(tree
, OBJ_TREE
);
1122 if (memchr(msg
->buf
, '\0', msg
->len
))
1123 return error("a NUL byte in commit log message not allowed.");
1125 /* Not having i18n.commitencoding is the same as having utf-8 */
1126 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1128 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1129 strbuf_addf(&buffer
, "tree %s\n", sha1_to_hex(tree
));
1132 * NOTE! This ordering means that the same exact tree merged with a
1133 * different order of parents will be a _different_ changeset even
1134 * if everything else stays the same.
1137 struct commit_list
*next
= parents
->next
;
1138 struct commit
*parent
= parents
->item
;
1140 strbuf_addf(&buffer
, "parent %s\n",
1141 sha1_to_hex(parent
->object
.sha1
));
1146 /* Person/date information */
1148 author
= git_author_info(IDENT_ERROR_ON_NO_NAME
);
1149 strbuf_addf(&buffer
, "author %s\n", author
);
1150 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_ERROR_ON_NO_NAME
));
1151 if (!encoding_is_utf8
)
1152 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1155 add_extra_header(&buffer
, extra
);
1156 extra
= extra
->next
;
1158 strbuf_addch(&buffer
, '\n');
1160 /* And add the comment */
1161 strbuf_addbuf(&buffer
, msg
);
1163 /* And check the encoding */
1164 if (encoding_is_utf8
&& !is_utf8(buffer
.buf
))
1165 fprintf(stderr
, commit_utf8_warn
);
1167 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
))
1170 result
= write_sha1_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1171 strbuf_release(&buffer
);
1175 struct commit
*get_merge_parent(const char *name
)
1178 struct commit
*commit
;
1179 unsigned char sha1
[20];
1180 if (get_sha1(name
, sha1
))
1182 obj
= parse_object(sha1
);
1183 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1184 if (commit
&& !commit
->util
) {
1185 struct merge_remote_desc
*desc
;
1186 desc
= xmalloc(sizeof(*desc
));
1188 desc
->name
= strdup(name
);
1189 commit
->util
= desc
;