4 #include "commit-graph.h"
5 #include "repository.h"
6 #include "object-store.h"
13 #include "gpg-interface.h"
14 #include "mergesort.h"
15 #include "commit-slab.h"
16 #include "prio-queue.h"
17 #include "sha1-lookup.h"
18 #include "wt-status.h"
22 static struct commit_extra_header
*read_commit_extra_header_lines(const char *buf
, size_t len
, const char **);
24 int save_commit_buffer
= 1;
26 const char *commit_type
= "commit";
28 struct commit
*lookup_commit_reference_gently(struct repository
*r
,
29 const struct object_id
*oid
, int quiet
)
31 struct object
*obj
= deref_tag(r
,
37 return object_as_type(r
, obj
, OBJ_COMMIT
, quiet
);
40 struct commit
*lookup_commit_reference(struct repository
*r
, const struct object_id
*oid
)
42 return lookup_commit_reference_gently(r
, oid
, 0);
45 struct commit
*lookup_commit_or_die(const struct object_id
*oid
, const char *ref_name
)
47 struct commit
*c
= lookup_commit_reference(the_repository
, oid
);
49 die(_("could not parse %s"), ref_name
);
50 if (oidcmp(oid
, &c
->object
.oid
)) {
51 warning(_("%s %s is not a commit!"),
52 ref_name
, oid_to_hex(oid
));
57 struct commit
*lookup_commit(struct repository
*r
, const struct object_id
*oid
)
59 struct object
*obj
= lookup_object(r
, oid
->hash
);
61 return create_object(r
, oid
->hash
,
62 alloc_commit_node(r
));
63 return object_as_type(r
, obj
, OBJ_COMMIT
, 0);
66 struct commit
*lookup_commit_reference_by_name(const char *name
)
69 struct commit
*commit
;
71 if (get_oid_committish(name
, &oid
))
73 commit
= lookup_commit_reference(the_repository
, &oid
);
74 if (parse_commit(commit
))
79 static timestamp_t
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 parsing will stop at buf-1 */
103 return parse_timestamp(dateptr
, NULL
, 10);
106 static const unsigned char *commit_graft_sha1_access(size_t index
, void *table
)
108 struct commit_graft
**commit_graft_table
= table
;
109 return commit_graft_table
[index
]->oid
.hash
;
112 static int commit_graft_pos(struct repository
*r
, const unsigned char *sha1
)
114 return sha1_pos(sha1
, r
->parsed_objects
->grafts
,
115 r
->parsed_objects
->grafts_nr
,
116 commit_graft_sha1_access
);
119 int register_commit_graft(struct repository
*r
, struct commit_graft
*graft
,
122 int pos
= commit_graft_pos(r
, graft
->oid
.hash
);
128 free(r
->parsed_objects
->grafts
[pos
]);
129 r
->parsed_objects
->grafts
[pos
] = graft
;
134 ALLOC_GROW(r
->parsed_objects
->grafts
,
135 r
->parsed_objects
->grafts_nr
+ 1,
136 r
->parsed_objects
->grafts_alloc
);
137 r
->parsed_objects
->grafts_nr
++;
138 if (pos
< r
->parsed_objects
->grafts_nr
)
139 memmove(r
->parsed_objects
->grafts
+ pos
+ 1,
140 r
->parsed_objects
->grafts
+ pos
,
141 (r
->parsed_objects
->grafts_nr
- pos
- 1) *
142 sizeof(*r
->parsed_objects
->grafts
));
143 r
->parsed_objects
->grafts
[pos
] = graft
;
147 struct commit_graft
*read_graft_line(struct strbuf
*line
)
149 /* The format is just "Commit Parent1 Parent2 ...\n" */
151 const char *tail
= NULL
;
152 struct commit_graft
*graft
= NULL
;
153 struct object_id dummy_oid
, *oid
;
156 if (!line
->len
|| line
->buf
[0] == '#')
159 * phase 0 verifies line, counts hashes in line and allocates graft
160 * phase 1 fills graft
162 for (phase
= 0; phase
< 2; phase
++) {
163 oid
= graft
? &graft
->oid
: &dummy_oid
;
164 if (parse_oid_hex(line
->buf
, oid
, &tail
))
166 for (i
= 0; *tail
!= '\0'; i
++) {
167 oid
= graft
? &graft
->parent
[i
] : &dummy_oid
;
168 if (!isspace(*tail
++) || parse_oid_hex(tail
, oid
, &tail
))
172 graft
= xmalloc(st_add(sizeof(*graft
),
173 st_mult(sizeof(struct object_id
), i
)));
174 graft
->nr_parent
= i
;
180 error("bad graft data: %s", line
->buf
);
185 static int read_graft_file(struct repository
*r
, const char *graft_file
)
187 FILE *fp
= fopen_or_warn(graft_file
, "r");
188 struct strbuf buf
= STRBUF_INIT
;
191 if (advice_graft_file_deprecated
)
192 advise(_("Support for <GIT_DIR>/info/grafts is deprecated\n"
193 "and will be removed in a future Git version.\n"
195 "Please use \"git replace --convert-graft-file\"\n"
196 "to convert the grafts into replace refs.\n"
198 "Turn this message off by running\n"
199 "\"git config advice.graftFileDeprecated false\""));
200 while (!strbuf_getwholeline(&buf
, fp
, '\n')) {
201 /* The format is just "Commit Parent1 Parent2 ...\n" */
202 struct commit_graft
*graft
= read_graft_line(&buf
);
205 if (register_commit_graft(r
, graft
, 1))
206 error("duplicate graft data: %s", buf
.buf
);
209 strbuf_release(&buf
);
213 static void prepare_commit_graft(struct repository
*r
)
217 if (r
->parsed_objects
->commit_graft_prepared
)
219 if (!startup_info
->have_repository
)
222 graft_file
= get_graft_file(r
);
223 read_graft_file(r
, graft_file
);
224 /* make sure shallows are read */
225 is_repository_shallow(r
);
226 r
->parsed_objects
->commit_graft_prepared
= 1;
229 struct commit_graft
*lookup_commit_graft(struct repository
*r
, const struct object_id
*oid
)
232 prepare_commit_graft(r
);
233 pos
= commit_graft_pos(r
, oid
->hash
);
236 return r
->parsed_objects
->grafts
[pos
];
239 int for_each_commit_graft(each_commit_graft_fn fn
, void *cb_data
)
242 for (i
= ret
= 0; i
< the_repository
->parsed_objects
->grafts_nr
&& !ret
; i
++)
243 ret
= fn(the_repository
->parsed_objects
->grafts
[i
], cb_data
);
247 int unregister_shallow(const struct object_id
*oid
)
249 int pos
= commit_graft_pos(the_repository
, oid
->hash
);
252 if (pos
+ 1 < the_repository
->parsed_objects
->grafts_nr
)
253 MOVE_ARRAY(the_repository
->parsed_objects
->grafts
+ pos
,
254 the_repository
->parsed_objects
->grafts
+ pos
+ 1,
255 the_repository
->parsed_objects
->grafts_nr
- pos
- 1);
256 the_repository
->parsed_objects
->grafts_nr
--;
260 struct commit_buffer
{
264 define_commit_slab(buffer_slab
, struct commit_buffer
);
266 struct buffer_slab
*allocate_commit_buffer_slab(void)
268 struct buffer_slab
*bs
= xmalloc(sizeof(*bs
));
269 init_buffer_slab(bs
);
273 void free_commit_buffer_slab(struct buffer_slab
*bs
)
275 clear_buffer_slab(bs
);
279 void set_commit_buffer(struct repository
*r
, struct commit
*commit
, void *buffer
, unsigned long size
)
281 struct commit_buffer
*v
= buffer_slab_at(
282 r
->parsed_objects
->buffer_slab
, commit
);
287 const void *get_cached_commit_buffer(struct repository
*r
, const struct commit
*commit
, unsigned long *sizep
)
289 struct commit_buffer
*v
= buffer_slab_peek(
290 r
->parsed_objects
->buffer_slab
, commit
);
301 const void *get_commit_buffer(const struct commit
*commit
, unsigned long *sizep
)
303 const void *ret
= get_cached_commit_buffer(the_repository
, commit
, sizep
);
305 enum object_type type
;
307 ret
= read_object_file(&commit
->object
.oid
, &type
, &size
);
309 die("cannot read commit object %s",
310 oid_to_hex(&commit
->object
.oid
));
311 if (type
!= OBJ_COMMIT
)
312 die("expected commit for %s, got %s",
313 oid_to_hex(&commit
->object
.oid
), type_name(type
));
320 void unuse_commit_buffer(const struct commit
*commit
, const void *buffer
)
322 struct commit_buffer
*v
= buffer_slab_peek(
323 the_repository
->parsed_objects
->buffer_slab
, commit
);
324 if (!(v
&& v
->buffer
== buffer
))
325 free((void *)buffer
);
328 void free_commit_buffer(struct commit
*commit
)
330 struct commit_buffer
*v
= buffer_slab_peek(
331 the_repository
->parsed_objects
->buffer_slab
, commit
);
333 FREE_AND_NULL(v
->buffer
);
338 struct tree
*get_commit_tree(const struct commit
*commit
)
340 if (commit
->maybe_tree
|| !commit
->object
.parsed
)
341 return commit
->maybe_tree
;
343 if (commit
->graph_pos
== COMMIT_NOT_FROM_GRAPH
)
344 BUG("commit has NULL tree, but was not loaded from commit-graph");
346 return get_commit_tree_in_graph(the_repository
, commit
);
349 struct object_id
*get_commit_tree_oid(const struct commit
*commit
)
351 return &get_commit_tree(commit
)->object
.oid
;
354 void release_commit_memory(struct commit
*c
)
356 c
->maybe_tree
= NULL
;
358 free_commit_buffer(c
);
359 free_commit_list(c
->parents
);
360 /* TODO: what about commit->util? */
362 c
->object
.parsed
= 0;
365 const void *detach_commit_buffer(struct commit
*commit
, unsigned long *sizep
)
367 struct commit_buffer
*v
= buffer_slab_peek(
368 the_repository
->parsed_objects
->buffer_slab
, commit
);
385 int parse_commit_buffer(struct repository
*r
, struct commit
*item
, const void *buffer
, unsigned long size
, int check_graph
)
387 const char *tail
= buffer
;
388 const char *bufptr
= buffer
;
389 struct object_id parent
;
390 struct commit_list
**pptr
;
391 struct commit_graft
*graft
;
392 const int tree_entry_len
= the_hash_algo
->hexsz
+ 5;
393 const int parent_entry_len
= the_hash_algo
->hexsz
+ 7;
395 if (item
->object
.parsed
)
397 item
->object
.parsed
= 1;
399 if (tail
<= bufptr
+ tree_entry_len
+ 1 || memcmp(bufptr
, "tree ", 5) ||
400 bufptr
[tree_entry_len
] != '\n')
401 return error("bogus commit object %s", oid_to_hex(&item
->object
.oid
));
402 if (get_oid_hex(bufptr
+ 5, &parent
) < 0)
403 return error("bad tree pointer in commit %s",
404 oid_to_hex(&item
->object
.oid
));
405 item
->maybe_tree
= lookup_tree(r
, &parent
);
406 bufptr
+= tree_entry_len
+ 1; /* "tree " + "hex sha1" + "\n" */
407 pptr
= &item
->parents
;
409 graft
= lookup_commit_graft(r
, &item
->object
.oid
);
410 while (bufptr
+ parent_entry_len
< tail
&& !memcmp(bufptr
, "parent ", 7)) {
411 struct commit
*new_parent
;
413 if (tail
<= bufptr
+ parent_entry_len
+ 1 ||
414 get_oid_hex(bufptr
+ 7, &parent
) ||
415 bufptr
[parent_entry_len
] != '\n')
416 return error("bad parents in commit %s", oid_to_hex(&item
->object
.oid
));
417 bufptr
+= parent_entry_len
+ 1;
419 * The clone is shallow if nr_parent < 0, and we must
420 * not traverse its real parents even when we unhide them.
422 if (graft
&& (graft
->nr_parent
< 0 || grafts_replace_parents
))
424 new_parent
= lookup_commit(r
, &parent
);
426 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
430 struct commit
*new_parent
;
431 for (i
= 0; i
< graft
->nr_parent
; i
++) {
432 new_parent
= lookup_commit(r
,
436 pptr
= &commit_list_insert(new_parent
, pptr
)->next
;
439 item
->date
= parse_commit_date(bufptr
, tail
);
442 load_commit_graph_info(the_repository
, item
);
447 int parse_commit_internal(struct commit
*item
, int quiet_on_missing
, int use_commit_graph
)
449 enum object_type type
;
456 if (item
->object
.parsed
)
458 if (use_commit_graph
&& parse_commit_in_graph(the_repository
, item
))
460 buffer
= read_object_file(&item
->object
.oid
, &type
, &size
);
462 return quiet_on_missing
? -1 :
463 error("Could not read %s",
464 oid_to_hex(&item
->object
.oid
));
465 if (type
!= OBJ_COMMIT
) {
467 return error("Object %s not a commit",
468 oid_to_hex(&item
->object
.oid
));
471 ret
= parse_commit_buffer(the_repository
, item
, buffer
, size
, 0);
472 if (save_commit_buffer
&& !ret
) {
473 set_commit_buffer(the_repository
, item
, buffer
, size
);
480 int parse_commit_gently(struct commit
*item
, int quiet_on_missing
)
482 return parse_commit_internal(item
, quiet_on_missing
, 1);
485 void parse_commit_or_die(struct commit
*item
)
487 if (parse_commit(item
))
488 die("unable to parse commit %s",
489 item
? oid_to_hex(&item
->object
.oid
) : "(null)");
492 int find_commit_subject(const char *commit_buffer
, const char **subject
)
495 const char *p
= commit_buffer
;
497 while (*p
&& (*p
!= '\n' || p
[1] != '\n'))
500 p
= skip_blank_lines(p
+ 2);
501 eol
= strchrnul(p
, '\n');
510 struct commit_list
*commit_list_insert(struct commit
*item
, struct commit_list
**list_p
)
512 struct commit_list
*new_list
= xmalloc(sizeof(struct commit_list
));
513 new_list
->item
= item
;
514 new_list
->next
= *list_p
;
519 unsigned commit_list_count(const struct commit_list
*l
)
522 for (; l
; l
= l
->next
)
527 struct commit_list
*copy_commit_list(struct commit_list
*list
)
529 struct commit_list
*head
= NULL
;
530 struct commit_list
**pp
= &head
;
532 pp
= commit_list_append(list
->item
, pp
);
538 void free_commit_list(struct commit_list
*list
)
544 struct commit_list
* commit_list_insert_by_date(struct commit
*item
, struct commit_list
**list
)
546 struct commit_list
**pp
= list
;
547 struct commit_list
*p
;
548 while ((p
= *pp
) != NULL
) {
549 if (p
->item
->date
< item
->date
) {
554 return commit_list_insert(item
, pp
);
557 static int commit_list_compare_by_date(const void *a
, const void *b
)
559 timestamp_t a_date
= ((const struct commit_list
*)a
)->item
->date
;
560 timestamp_t b_date
= ((const struct commit_list
*)b
)->item
->date
;
568 static void *commit_list_get_next(const void *a
)
570 return ((const struct commit_list
*)a
)->next
;
573 static void commit_list_set_next(void *a
, void *next
)
575 ((struct commit_list
*)a
)->next
= next
;
578 void commit_list_sort_by_date(struct commit_list
**list
)
580 *list
= llist_mergesort(*list
, commit_list_get_next
, commit_list_set_next
,
581 commit_list_compare_by_date
);
584 struct commit
*pop_most_recent_commit(struct commit_list
**list
,
587 struct commit
*ret
= pop_commit(list
);
588 struct commit_list
*parents
= ret
->parents
;
591 struct commit
*commit
= parents
->item
;
592 if (!parse_commit(commit
) && !(commit
->object
.flags
& mark
)) {
593 commit
->object
.flags
|= mark
;
594 commit_list_insert_by_date(commit
, list
);
596 parents
= parents
->next
;
601 static void clear_commit_marks_1(struct commit_list
**plist
,
602 struct commit
*commit
, unsigned int mark
)
605 struct commit_list
*parents
;
607 if (!(mark
& commit
->object
.flags
))
610 commit
->object
.flags
&= ~mark
;
612 parents
= commit
->parents
;
616 while ((parents
= parents
->next
))
617 commit_list_insert(parents
->item
, plist
);
619 commit
= commit
->parents
->item
;
623 void clear_commit_marks_many(int nr
, struct commit
**commit
, unsigned int mark
)
625 struct commit_list
*list
= NULL
;
628 clear_commit_marks_1(&list
, *commit
, mark
);
632 clear_commit_marks_1(&list
, pop_commit(&list
), mark
);
635 void clear_commit_marks(struct commit
*commit
, unsigned int mark
)
637 clear_commit_marks_many(1, &commit
, mark
);
640 struct commit
*pop_commit(struct commit_list
**stack
)
642 struct commit_list
*top
= *stack
;
643 struct commit
*item
= top
? top
->item
: NULL
;
653 * Topological sort support
656 /* count number of children that have not been emitted */
657 define_commit_slab(indegree_slab
, int);
659 /* record author-date for each commit object */
660 define_commit_slab(author_date_slab
, unsigned long);
662 static void record_author_date(struct author_date_slab
*author_date
,
663 struct commit
*commit
)
665 const char *buffer
= get_commit_buffer(commit
, NULL
);
666 struct ident_split ident
;
667 const char *ident_line
;
672 ident_line
= find_commit_header(buffer
, "author", &ident_len
);
674 goto fail_exit
; /* no author line */
675 if (split_ident_line(&ident
, ident_line
, ident_len
) ||
676 !ident
.date_begin
|| !ident
.date_end
)
677 goto fail_exit
; /* malformed "author" line */
679 date
= parse_timestamp(ident
.date_begin
, &date_end
, 10);
680 if (date_end
!= ident
.date_end
)
681 goto fail_exit
; /* malformed date */
682 *(author_date_slab_at(author_date
, commit
)) = date
;
685 unuse_commit_buffer(commit
, buffer
);
688 static int compare_commits_by_author_date(const void *a_
, const void *b_
,
691 const struct commit
*a
= a_
, *b
= b_
;
692 struct author_date_slab
*author_date
= cb_data
;
693 timestamp_t a_date
= *(author_date_slab_at(author_date
, a
));
694 timestamp_t b_date
= *(author_date_slab_at(author_date
, b
));
696 /* newer commits with larger date first */
699 else if (a_date
> b_date
)
704 int compare_commits_by_gen_then_commit_date(const void *a_
, const void *b_
, void *unused
)
706 const struct commit
*a
= a_
, *b
= b_
;
708 /* newer commits first */
709 if (a
->generation
< b
->generation
)
711 else if (a
->generation
> b
->generation
)
714 /* use date as a heuristic when generations are equal */
715 if (a
->date
< b
->date
)
717 else if (a
->date
> b
->date
)
722 int compare_commits_by_commit_date(const void *a_
, const void *b_
, void *unused
)
724 const struct commit
*a
= a_
, *b
= b_
;
725 /* newer commits with larger date first */
726 if (a
->date
< b
->date
)
728 else if (a
->date
> b
->date
)
734 * Performs an in-place topological sort on the list supplied.
736 void sort_in_topological_order(struct commit_list
**list
, enum rev_sort_order sort_order
)
738 struct commit_list
*next
, *orig
= *list
;
739 struct commit_list
**pptr
;
740 struct indegree_slab indegree
;
741 struct prio_queue queue
;
742 struct commit
*commit
;
743 struct author_date_slab author_date
;
749 init_indegree_slab(&indegree
);
750 memset(&queue
, '\0', sizeof(queue
));
752 switch (sort_order
) {
753 default: /* REV_SORT_IN_GRAPH_ORDER */
754 queue
.compare
= NULL
;
756 case REV_SORT_BY_COMMIT_DATE
:
757 queue
.compare
= compare_commits_by_commit_date
;
759 case REV_SORT_BY_AUTHOR_DATE
:
760 init_author_date_slab(&author_date
);
761 queue
.compare
= compare_commits_by_author_date
;
762 queue
.cb_data
= &author_date
;
766 /* Mark them and clear the indegree */
767 for (next
= orig
; next
; next
= next
->next
) {
768 struct commit
*commit
= next
->item
;
769 *(indegree_slab_at(&indegree
, commit
)) = 1;
770 /* also record the author dates, if needed */
771 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
772 record_author_date(&author_date
, commit
);
775 /* update the indegree */
776 for (next
= orig
; next
; next
= next
->next
) {
777 struct commit_list
*parents
= next
->item
->parents
;
779 struct commit
*parent
= parents
->item
;
780 int *pi
= indegree_slab_at(&indegree
, parent
);
784 parents
= parents
->next
;
791 * tips are nodes not reachable from any other node in the list
793 * the tips serve as a starting set for the work queue.
795 for (next
= orig
; next
; next
= next
->next
) {
796 struct commit
*commit
= next
->item
;
798 if (*(indegree_slab_at(&indegree
, commit
)) == 1)
799 prio_queue_put(&queue
, commit
);
803 * This is unfortunate; the initial tips need to be shown
804 * in the order given from the revision traversal machinery.
806 if (sort_order
== REV_SORT_IN_GRAPH_ORDER
)
807 prio_queue_reverse(&queue
);
809 /* We no longer need the commit list */
810 free_commit_list(orig
);
814 while ((commit
= prio_queue_get(&queue
)) != NULL
) {
815 struct commit_list
*parents
;
817 for (parents
= commit
->parents
; parents
; parents
= parents
->next
) {
818 struct commit
*parent
= parents
->item
;
819 int *pi
= indegree_slab_at(&indegree
, parent
);
825 * parents are only enqueued for emission
826 * when all their children have been emitted thereby
827 * guaranteeing topological order.
830 prio_queue_put(&queue
, parent
);
833 * all children of commit have already been
834 * emitted. we can emit it now.
836 *(indegree_slab_at(&indegree
, commit
)) = 0;
838 pptr
= &commit_list_insert(commit
, pptr
)->next
;
841 clear_indegree_slab(&indegree
);
842 clear_prio_queue(&queue
);
843 if (sort_order
== REV_SORT_BY_AUTHOR_DATE
)
844 clear_author_date_slab(&author_date
);
847 /* merge-base stuff */
849 /* Remember to update object flag allocation in object.h */
850 #define PARENT1 (1u<<16)
851 #define PARENT2 (1u<<17)
852 #define STALE (1u<<18)
853 #define RESULT (1u<<19)
855 static const unsigned all_flags
= (PARENT1
| PARENT2
| STALE
| RESULT
);
857 static int queue_has_nonstale(struct prio_queue
*queue
)
860 for (i
= 0; i
< queue
->nr
; i
++) {
861 struct commit
*commit
= queue
->array
[i
].data
;
862 if (!(commit
->object
.flags
& STALE
))
868 /* all input commits in one and twos[] must have been parsed! */
869 static struct commit_list
*paint_down_to_common(struct commit
*one
, int n
,
870 struct commit
**twos
,
873 struct prio_queue queue
= { compare_commits_by_gen_then_commit_date
};
874 struct commit_list
*result
= NULL
;
876 uint32_t last_gen
= GENERATION_NUMBER_INFINITY
;
878 one
->object
.flags
|= PARENT1
;
880 commit_list_append(one
, &result
);
883 prio_queue_put(&queue
, one
);
885 for (i
= 0; i
< n
; i
++) {
886 twos
[i
]->object
.flags
|= PARENT2
;
887 prio_queue_put(&queue
, twos
[i
]);
890 while (queue_has_nonstale(&queue
)) {
891 struct commit
*commit
= prio_queue_get(&queue
);
892 struct commit_list
*parents
;
895 if (commit
->generation
> last_gen
)
896 BUG("bad generation skip %8x > %8x at %s",
897 commit
->generation
, last_gen
,
898 oid_to_hex(&commit
->object
.oid
));
899 last_gen
= commit
->generation
;
901 if (commit
->generation
< min_generation
)
904 flags
= commit
->object
.flags
& (PARENT1
| PARENT2
| STALE
);
905 if (flags
== (PARENT1
| PARENT2
)) {
906 if (!(commit
->object
.flags
& RESULT
)) {
907 commit
->object
.flags
|= RESULT
;
908 commit_list_insert_by_date(commit
, &result
);
910 /* Mark parents of a found merge stale */
913 parents
= commit
->parents
;
915 struct commit
*p
= parents
->item
;
916 parents
= parents
->next
;
917 if ((p
->object
.flags
& flags
) == flags
)
921 p
->object
.flags
|= flags
;
922 prio_queue_put(&queue
, p
);
926 clear_prio_queue(&queue
);
930 static struct commit_list
*merge_bases_many(struct commit
*one
, int n
, struct commit
**twos
)
932 struct commit_list
*list
= NULL
;
933 struct commit_list
*result
= NULL
;
936 for (i
= 0; i
< n
; i
++) {
939 * We do not mark this even with RESULT so we do not
940 * have to clean it up.
942 return commit_list_insert(one
, &result
);
945 if (parse_commit(one
))
947 for (i
= 0; i
< n
; i
++) {
948 if (parse_commit(twos
[i
]))
952 list
= paint_down_to_common(one
, n
, twos
, 0);
955 struct commit
*commit
= pop_commit(&list
);
956 if (!(commit
->object
.flags
& STALE
))
957 commit_list_insert_by_date(commit
, &result
);
963 struct commit
**commit
;
966 unsigned int initial
: 1;
969 static void add_one_commit(struct object_id
*oid
, struct rev_collect
*revs
)
971 struct commit
*commit
;
973 if (is_null_oid(oid
))
976 commit
= lookup_commit(the_repository
, oid
);
978 (commit
->object
.flags
& TMP_MARK
) ||
979 parse_commit(commit
))
982 ALLOC_GROW(revs
->commit
, revs
->nr
+ 1, revs
->alloc
);
983 revs
->commit
[revs
->nr
++] = commit
;
984 commit
->object
.flags
|= TMP_MARK
;
987 static int collect_one_reflog_ent(struct object_id
*ooid
, struct object_id
*noid
,
988 const char *ident
, timestamp_t timestamp
,
989 int tz
, const char *message
, void *cbdata
)
991 struct rev_collect
*revs
= cbdata
;
995 add_one_commit(ooid
, revs
);
997 add_one_commit(noid
, revs
);
1001 struct commit
*get_fork_point(const char *refname
, struct commit
*commit
)
1003 struct object_id oid
;
1004 struct rev_collect revs
;
1005 struct commit_list
*bases
;
1007 struct commit
*ret
= NULL
;
1009 memset(&revs
, 0, sizeof(revs
));
1011 for_each_reflog_ent(refname
, collect_one_reflog_ent
, &revs
);
1013 if (!revs
.nr
&& !get_oid(refname
, &oid
))
1014 add_one_commit(&oid
, &revs
);
1016 for (i
= 0; i
< revs
.nr
; i
++)
1017 revs
.commit
[i
]->object
.flags
&= ~TMP_MARK
;
1019 bases
= get_merge_bases_many(commit
, revs
.nr
, revs
.commit
);
1022 * There should be one and only one merge base, when we found
1023 * a common ancestor among reflog entries.
1025 if (!bases
|| bases
->next
)
1026 goto cleanup_return
;
1028 /* And the found one must be one of the reflog entries */
1029 for (i
= 0; i
< revs
.nr
; i
++)
1030 if (&bases
->item
->object
== &revs
.commit
[i
]->object
)
1033 goto cleanup_return
;
1038 free_commit_list(bases
);
1042 struct commit_list
*get_octopus_merge_bases(struct commit_list
*in
)
1044 struct commit_list
*i
, *j
, *k
, *ret
= NULL
;
1049 commit_list_insert(in
->item
, &ret
);
1051 for (i
= in
->next
; i
; i
= i
->next
) {
1052 struct commit_list
*new_commits
= NULL
, *end
= NULL
;
1054 for (j
= ret
; j
; j
= j
->next
) {
1055 struct commit_list
*bases
;
1056 bases
= get_merge_bases(i
->item
, j
->item
);
1058 new_commits
= bases
;
1061 for (k
= bases
; k
; k
= k
->next
)
1069 static int remove_redundant(struct commit
**array
, int cnt
)
1072 * Some commit in the array may be an ancestor of
1073 * another commit. Move such commit to the end of
1074 * the array, and return the number of commits that
1075 * are independent from each other.
1077 struct commit
**work
;
1078 unsigned char *redundant
;
1082 work
= xcalloc(cnt
, sizeof(*work
));
1083 redundant
= xcalloc(cnt
, 1);
1084 ALLOC_ARRAY(filled_index
, cnt
- 1);
1086 for (i
= 0; i
< cnt
; i
++)
1087 parse_commit(array
[i
]);
1088 for (i
= 0; i
< cnt
; i
++) {
1089 struct commit_list
*common
;
1090 uint32_t min_generation
= array
[i
]->generation
;
1094 for (j
= filled
= 0; j
< cnt
; j
++) {
1095 if (i
== j
|| redundant
[j
])
1097 filled_index
[filled
] = j
;
1098 work
[filled
++] = array
[j
];
1100 if (array
[j
]->generation
< min_generation
)
1101 min_generation
= array
[j
]->generation
;
1103 common
= paint_down_to_common(array
[i
], filled
, work
,
1105 if (array
[i
]->object
.flags
& PARENT2
)
1107 for (j
= 0; j
< filled
; j
++)
1108 if (work
[j
]->object
.flags
& PARENT1
)
1109 redundant
[filled_index
[j
]] = 1;
1110 clear_commit_marks(array
[i
], all_flags
);
1111 clear_commit_marks_many(filled
, work
, all_flags
);
1112 free_commit_list(common
);
1115 /* Now collect the result */
1116 COPY_ARRAY(work
, array
, cnt
);
1117 for (i
= filled
= 0; i
< cnt
; i
++)
1119 array
[filled
++] = work
[i
];
1120 for (j
= filled
, i
= 0; i
< cnt
; i
++)
1122 array
[j
++] = work
[i
];
1129 static struct commit_list
*get_merge_bases_many_0(struct commit
*one
,
1131 struct commit
**twos
,
1134 struct commit_list
*list
;
1135 struct commit
**rslt
;
1136 struct commit_list
*result
;
1139 result
= merge_bases_many(one
, n
, twos
);
1140 for (i
= 0; i
< n
; i
++) {
1144 if (!result
|| !result
->next
) {
1146 clear_commit_marks(one
, all_flags
);
1147 clear_commit_marks_many(n
, twos
, all_flags
);
1152 /* There are more than one */
1153 cnt
= commit_list_count(result
);
1154 rslt
= xcalloc(cnt
, sizeof(*rslt
));
1155 for (list
= result
, i
= 0; list
; list
= list
->next
)
1156 rslt
[i
++] = list
->item
;
1157 free_commit_list(result
);
1159 clear_commit_marks(one
, all_flags
);
1160 clear_commit_marks_many(n
, twos
, all_flags
);
1162 cnt
= remove_redundant(rslt
, cnt
);
1164 for (i
= 0; i
< cnt
; i
++)
1165 commit_list_insert_by_date(rslt
[i
], &result
);
1170 struct commit_list
*get_merge_bases_many(struct commit
*one
,
1172 struct commit
**twos
)
1174 return get_merge_bases_many_0(one
, n
, twos
, 1);
1177 struct commit_list
*get_merge_bases_many_dirty(struct commit
*one
,
1179 struct commit
**twos
)
1181 return get_merge_bases_many_0(one
, n
, twos
, 0);
1184 struct commit_list
*get_merge_bases(struct commit
*one
, struct commit
*two
)
1186 return get_merge_bases_many_0(one
, 1, &two
, 1);
1190 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1192 int is_descendant_of(struct commit
*commit
, struct commit_list
*with_commit
)
1196 while (with_commit
) {
1197 struct commit
*other
;
1199 other
= with_commit
->item
;
1200 with_commit
= with_commit
->next
;
1201 if (in_merge_bases(other
, commit
))
1208 * Is "commit" an ancestor of one of the "references"?
1210 int in_merge_bases_many(struct commit
*commit
, int nr_reference
, struct commit
**reference
)
1212 struct commit_list
*bases
;
1214 uint32_t min_generation
= GENERATION_NUMBER_INFINITY
;
1216 if (parse_commit(commit
))
1218 for (i
= 0; i
< nr_reference
; i
++) {
1219 if (parse_commit(reference
[i
]))
1221 if (reference
[i
]->generation
< min_generation
)
1222 min_generation
= reference
[i
]->generation
;
1225 if (commit
->generation
> min_generation
)
1228 bases
= paint_down_to_common(commit
, nr_reference
, reference
, commit
->generation
);
1229 if (commit
->object
.flags
& PARENT2
)
1231 clear_commit_marks(commit
, all_flags
);
1232 clear_commit_marks_many(nr_reference
, reference
, all_flags
);
1233 free_commit_list(bases
);
1238 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1240 int in_merge_bases(struct commit
*commit
, struct commit
*reference
)
1242 return in_merge_bases_many(commit
, 1, &reference
);
1245 struct commit_list
*reduce_heads(struct commit_list
*heads
)
1247 struct commit_list
*p
;
1248 struct commit_list
*result
= NULL
, **tail
= &result
;
1249 struct commit
**array
;
1256 for (p
= heads
; p
; p
= p
->next
)
1257 p
->item
->object
.flags
&= ~STALE
;
1258 for (p
= heads
, num_head
= 0; p
; p
= p
->next
) {
1259 if (p
->item
->object
.flags
& STALE
)
1261 p
->item
->object
.flags
|= STALE
;
1264 array
= xcalloc(num_head
, sizeof(*array
));
1265 for (p
= heads
, i
= 0; p
; p
= p
->next
) {
1266 if (p
->item
->object
.flags
& STALE
) {
1267 array
[i
++] = p
->item
;
1268 p
->item
->object
.flags
&= ~STALE
;
1271 num_head
= remove_redundant(array
, num_head
);
1272 for (i
= 0; i
< num_head
; i
++)
1273 tail
= &commit_list_insert(array
[i
], tail
)->next
;
1278 void reduce_heads_replace(struct commit_list
**heads
)
1280 struct commit_list
*result
= reduce_heads(*heads
);
1281 free_commit_list(*heads
);
1285 static const char gpg_sig_header
[] = "gpgsig";
1286 static const int gpg_sig_header_len
= sizeof(gpg_sig_header
) - 1;
1288 static int do_sign_commit(struct strbuf
*buf
, const char *keyid
)
1290 struct strbuf sig
= STRBUF_INIT
;
1291 int inspos
, copypos
;
1294 /* find the end of the header */
1295 eoh
= strstr(buf
->buf
, "\n\n");
1299 inspos
= eoh
- buf
->buf
+ 1;
1301 if (!keyid
|| !*keyid
)
1302 keyid
= get_signing_key();
1303 if (sign_buffer(buf
, &sig
, keyid
)) {
1304 strbuf_release(&sig
);
1308 for (copypos
= 0; sig
.buf
[copypos
]; ) {
1309 const char *bol
= sig
.buf
+ copypos
;
1310 const char *eol
= strchrnul(bol
, '\n');
1311 int len
= (eol
- bol
) + !!*eol
;
1314 strbuf_insert(buf
, inspos
, gpg_sig_header
, gpg_sig_header_len
);
1315 inspos
+= gpg_sig_header_len
;
1317 strbuf_insert(buf
, inspos
++, " ", 1);
1318 strbuf_insert(buf
, inspos
, bol
, len
);
1322 strbuf_release(&sig
);
1326 int parse_signed_commit(const struct commit
*commit
,
1327 struct strbuf
*payload
, struct strbuf
*signature
)
1331 const char *buffer
= get_commit_buffer(commit
, &size
);
1332 int in_signature
, saw_signature
= -1;
1333 const char *line
, *tail
;
1336 tail
= buffer
+ size
;
1339 while (line
< tail
) {
1340 const char *sig
= NULL
;
1341 const char *next
= memchr(line
, '\n', tail
- line
);
1343 next
= next
? next
+ 1 : tail
;
1344 if (in_signature
&& line
[0] == ' ')
1346 else if (starts_with(line
, gpg_sig_header
) &&
1347 line
[gpg_sig_header_len
] == ' ')
1348 sig
= line
+ gpg_sig_header_len
+ 1;
1350 strbuf_add(signature
, sig
, next
- sig
);
1355 /* dump the whole remainder of the buffer */
1357 strbuf_add(payload
, line
, next
- line
);
1362 unuse_commit_buffer(commit
, buffer
);
1363 return saw_signature
;
1366 int remove_signature(struct strbuf
*buf
)
1368 const char *line
= buf
->buf
;
1369 const char *tail
= buf
->buf
+ buf
->len
;
1370 int in_signature
= 0;
1371 const char *sig_start
= NULL
;
1372 const char *sig_end
= NULL
;
1374 while (line
< tail
) {
1375 const char *next
= memchr(line
, '\n', tail
- line
);
1376 next
= next
? next
+ 1 : tail
;
1378 if (in_signature
&& line
[0] == ' ')
1380 else if (starts_with(line
, gpg_sig_header
) &&
1381 line
[gpg_sig_header_len
] == ' ') {
1387 /* dump the whole remainder of the buffer */
1395 strbuf_remove(buf
, sig_start
- buf
->buf
, sig_end
- sig_start
);
1397 return sig_start
!= NULL
;
1400 static void handle_signed_tag(struct commit
*parent
, struct commit_extra_header
***tail
)
1402 struct merge_remote_desc
*desc
;
1403 struct commit_extra_header
*mergetag
;
1405 unsigned long size
, len
;
1406 enum object_type type
;
1408 desc
= merge_remote_util(parent
);
1409 if (!desc
|| !desc
->obj
)
1411 buf
= read_object_file(&desc
->obj
->oid
, &type
, &size
);
1412 if (!buf
|| type
!= OBJ_TAG
)
1414 len
= parse_signature(buf
, size
);
1418 * We could verify this signature and either omit the tag when
1419 * it does not validate, but the integrator may not have the
1420 * public key of the signer of the tag he is merging, while a
1421 * later auditor may have it while auditing, so let's not run
1422 * verify-signed-buffer here for now...
1424 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1425 * warn("warning: signed tag unverified.");
1427 mergetag
= xcalloc(1, sizeof(*mergetag
));
1428 mergetag
->key
= xstrdup("mergetag");
1429 mergetag
->value
= buf
;
1430 mergetag
->len
= size
;
1433 *tail
= &mergetag
->next
;
1440 int check_commit_signature(const struct commit
*commit
, struct signature_check
*sigc
)
1442 struct strbuf payload
= STRBUF_INIT
;
1443 struct strbuf signature
= STRBUF_INIT
;
1448 if (parse_signed_commit(commit
, &payload
, &signature
) <= 0)
1450 ret
= check_signature(payload
.buf
, payload
.len
, signature
.buf
,
1451 signature
.len
, sigc
);
1454 strbuf_release(&payload
);
1455 strbuf_release(&signature
);
1462 void append_merge_tag_headers(struct commit_list
*parents
,
1463 struct commit_extra_header
***tail
)
1466 struct commit
*parent
= parents
->item
;
1467 handle_signed_tag(parent
, tail
);
1468 parents
= parents
->next
;
1472 static void add_extra_header(struct strbuf
*buffer
,
1473 struct commit_extra_header
*extra
)
1475 strbuf_addstr(buffer
, extra
->key
);
1477 strbuf_add_lines(buffer
, " ", extra
->value
, extra
->len
);
1479 strbuf_addch(buffer
, '\n');
1482 struct commit_extra_header
*read_commit_extra_headers(struct commit
*commit
,
1483 const char **exclude
)
1485 struct commit_extra_header
*extra
= NULL
;
1487 const char *buffer
= get_commit_buffer(commit
, &size
);
1488 extra
= read_commit_extra_header_lines(buffer
, size
, exclude
);
1489 unuse_commit_buffer(commit
, buffer
);
1493 int for_each_mergetag(each_mergetag_fn fn
, struct commit
*commit
, void *data
)
1495 struct commit_extra_header
*extra
, *to_free
;
1498 to_free
= read_commit_extra_headers(commit
, NULL
);
1499 for (extra
= to_free
; !res
&& extra
; extra
= extra
->next
) {
1500 if (strcmp(extra
->key
, "mergetag"))
1501 continue; /* not a merge tag */
1502 res
= fn(commit
, extra
, data
);
1504 free_commit_extra_headers(to_free
);
1508 static inline int standard_header_field(const char *field
, size_t len
)
1510 return ((len
== 4 && !memcmp(field
, "tree", 4)) ||
1511 (len
== 6 && !memcmp(field
, "parent", 6)) ||
1512 (len
== 6 && !memcmp(field
, "author", 6)) ||
1513 (len
== 9 && !memcmp(field
, "committer", 9)) ||
1514 (len
== 8 && !memcmp(field
, "encoding", 8)));
1517 static int excluded_header_field(const char *field
, size_t len
, const char **exclude
)
1523 size_t xlen
= strlen(*exclude
);
1524 if (len
== xlen
&& !memcmp(field
, *exclude
, xlen
))
1531 static struct commit_extra_header
*read_commit_extra_header_lines(
1532 const char *buffer
, size_t size
,
1533 const char **exclude
)
1535 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
, *it
= NULL
;
1536 const char *line
, *next
, *eof
, *eob
;
1537 struct strbuf buf
= STRBUF_INIT
;
1539 for (line
= buffer
, eob
= line
+ size
;
1540 line
< eob
&& *line
!= '\n';
1542 next
= memchr(line
, '\n', eob
- line
);
1543 next
= next
? next
+ 1 : eob
;
1547 strbuf_add(&buf
, line
+ 1, next
- (line
+ 1));
1551 it
->value
= strbuf_detach(&buf
, &it
->len
);
1555 eof
= memchr(line
, ' ', next
- line
);
1558 else if (standard_header_field(line
, eof
- line
) ||
1559 excluded_header_field(line
, eof
- line
, exclude
))
1562 it
= xcalloc(1, sizeof(*it
));
1563 it
->key
= xmemdupz(line
, eof
-line
);
1567 strbuf_add(&buf
, eof
+ 1, next
- (eof
+ 1));
1570 it
->value
= strbuf_detach(&buf
, &it
->len
);
1574 void free_commit_extra_headers(struct commit_extra_header
*extra
)
1577 struct commit_extra_header
*next
= extra
->next
;
1585 int commit_tree(const char *msg
, size_t msg_len
, const struct object_id
*tree
,
1586 struct commit_list
*parents
, struct object_id
*ret
,
1587 const char *author
, const char *sign_commit
)
1589 struct commit_extra_header
*extra
= NULL
, **tail
= &extra
;
1592 append_merge_tag_headers(parents
, &tail
);
1593 result
= commit_tree_extended(msg
, msg_len
, tree
, parents
, ret
,
1594 author
, sign_commit
, extra
);
1595 free_commit_extra_headers(extra
);
1599 static int find_invalid_utf8(const char *buf
, int len
)
1602 static const unsigned int max_codepoint
[] = {
1603 0x7f, 0x7ff, 0xffff, 0x10ffff
1607 unsigned char c
= *buf
++;
1608 int bytes
, bad_offset
;
1609 unsigned int codepoint
;
1610 unsigned int min_val
, max_val
;
1615 /* Simple US-ASCII? No worries. */
1619 bad_offset
= offset
-1;
1622 * Count how many more high bits set: that's how
1623 * many more bytes this sequence should have.
1632 * Must be between 1 and 3 more bytes. Longer sequences result in
1633 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1635 if (bytes
< 1 || 3 < bytes
)
1638 /* Do we *have* that many bytes? */
1643 * Place the encoded bits at the bottom of the value and compute the
1646 codepoint
= (c
& 0x7f) >> bytes
;
1647 min_val
= max_codepoint
[bytes
-1] + 1;
1648 max_val
= max_codepoint
[bytes
];
1653 /* And verify that they are good continuation bytes */
1656 codepoint
|= *buf
& 0x3f;
1657 if ((*buf
++ & 0xc0) != 0x80)
1661 /* Reject codepoints that are out of range for the sequence length. */
1662 if (codepoint
< min_val
|| codepoint
> max_val
)
1664 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1665 if ((codepoint
& 0x1ff800) == 0xd800)
1667 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1668 if ((codepoint
& 0xfffe) == 0xfffe)
1670 /* So are anything in the range U+FDD0..U+FDEF. */
1671 if (codepoint
>= 0xfdd0 && codepoint
<= 0xfdef)
1678 * This verifies that the buffer is in proper utf8 format.
1680 * If it isn't, it assumes any non-utf8 characters are Latin1,
1681 * and does the conversion.
1683 static int verify_utf8(struct strbuf
*buf
)
1691 unsigned char replace
[2];
1693 bad
= find_invalid_utf8(buf
->buf
+ pos
, buf
->len
- pos
);
1699 strbuf_remove(buf
, pos
, 1);
1701 /* We know 'c' must be in the range 128-255 */
1702 replace
[0] = 0xc0 + (c
>> 6);
1703 replace
[1] = 0x80 + (c
& 0x3f);
1704 strbuf_insert(buf
, pos
, replace
, 2);
1709 static const char commit_utf8_warn
[] =
1710 N_("Warning: commit message did not conform to UTF-8.\n"
1711 "You may want to amend it after fixing the message, or set the config\n"
1712 "variable i18n.commitencoding to the encoding your project uses.\n");
1714 int commit_tree_extended(const char *msg
, size_t msg_len
,
1715 const struct object_id
*tree
,
1716 struct commit_list
*parents
, struct object_id
*ret
,
1717 const char *author
, const char *sign_commit
,
1718 struct commit_extra_header
*extra
)
1721 int encoding_is_utf8
;
1722 struct strbuf buffer
;
1724 assert_oid_type(tree
, OBJ_TREE
);
1726 if (memchr(msg
, '\0', msg_len
))
1727 return error("a NUL byte in commit log message not allowed.");
1729 /* Not having i18n.commitencoding is the same as having utf-8 */
1730 encoding_is_utf8
= is_encoding_utf8(git_commit_encoding
);
1732 strbuf_init(&buffer
, 8192); /* should avoid reallocs for the headers */
1733 strbuf_addf(&buffer
, "tree %s\n", oid_to_hex(tree
));
1736 * NOTE! This ordering means that the same exact tree merged with a
1737 * different order of parents will be a _different_ changeset even
1738 * if everything else stays the same.
1741 struct commit
*parent
= pop_commit(&parents
);
1742 strbuf_addf(&buffer
, "parent %s\n",
1743 oid_to_hex(&parent
->object
.oid
));
1746 /* Person/date information */
1748 author
= git_author_info(IDENT_STRICT
);
1749 strbuf_addf(&buffer
, "author %s\n", author
);
1750 strbuf_addf(&buffer
, "committer %s\n", git_committer_info(IDENT_STRICT
));
1751 if (!encoding_is_utf8
)
1752 strbuf_addf(&buffer
, "encoding %s\n", git_commit_encoding
);
1755 add_extra_header(&buffer
, extra
);
1756 extra
= extra
->next
;
1758 strbuf_addch(&buffer
, '\n');
1760 /* And add the comment */
1761 strbuf_add(&buffer
, msg
, msg_len
);
1763 /* And check the encoding */
1764 if (encoding_is_utf8
&& !verify_utf8(&buffer
))
1765 fprintf(stderr
, _(commit_utf8_warn
));
1767 if (sign_commit
&& do_sign_commit(&buffer
, sign_commit
)) {
1772 result
= write_object_file(buffer
.buf
, buffer
.len
, commit_type
, ret
);
1774 strbuf_release(&buffer
);
1778 define_commit_slab(merge_desc_slab
, struct merge_remote_desc
*);
1779 static struct merge_desc_slab merge_desc_slab
= COMMIT_SLAB_INIT(1, merge_desc_slab
);
1781 struct merge_remote_desc
*merge_remote_util(struct commit
*commit
)
1783 return *merge_desc_slab_at(&merge_desc_slab
, commit
);
1786 void set_merge_remote_desc(struct commit
*commit
,
1787 const char *name
, struct object
*obj
)
1789 struct merge_remote_desc
*desc
;
1790 FLEX_ALLOC_STR(desc
, name
, name
);
1792 *merge_desc_slab_at(&merge_desc_slab
, commit
) = desc
;
1795 struct commit
*get_merge_parent(const char *name
)
1798 struct commit
*commit
;
1799 struct object_id oid
;
1800 if (get_oid(name
, &oid
))
1802 obj
= parse_object(the_repository
, &oid
);
1803 commit
= (struct commit
*)peel_to_type(name
, 0, obj
, OBJ_COMMIT
);
1804 if (commit
&& !merge_remote_util(commit
))
1805 set_merge_remote_desc(commit
, name
, obj
);
1810 * Append a commit to the end of the commit_list.
1812 * next starts by pointing to the variable that holds the head of an
1813 * empty commit_list, and is updated to point to the "next" field of
1814 * the last item on the list as new commits are appended.
1818 * struct commit_list *list;
1819 * struct commit_list **next = &list;
1821 * next = commit_list_append(c1, next);
1822 * next = commit_list_append(c2, next);
1823 * assert(commit_list_count(list) == 2);
1826 struct commit_list
**commit_list_append(struct commit
*commit
,
1827 struct commit_list
**next
)
1829 struct commit_list
*new_commit
= xmalloc(sizeof(struct commit_list
));
1830 new_commit
->item
= commit
;
1832 new_commit
->next
= NULL
;
1833 return &new_commit
->next
;
1836 const char *find_commit_header(const char *msg
, const char *key
, size_t *out_len
)
1838 int key_len
= strlen(key
);
1839 const char *line
= msg
;
1842 const char *eol
= strchrnul(line
, '\n');
1847 if (eol
- line
> key_len
&&
1848 !strncmp(line
, key
, key_len
) &&
1849 line
[key_len
] == ' ') {
1850 *out_len
= eol
- line
- key_len
- 1;
1851 return line
+ key_len
+ 1;
1853 line
= *eol
? eol
+ 1 : NULL
;
1859 * Inspect the given string and determine the true "end" of the log message, in
1860 * order to find where to put a new Signed-off-by: line. Ignored are
1861 * trailing comment lines and blank lines. To support "git commit -s
1862 * --amend" on an existing commit, we also ignore "Conflicts:". To
1863 * support "git commit -v", we truncate at cut lines.
1865 * Returns the number of bytes from the tail to ignore, to be fed as
1866 * the second parameter to append_signoff().
1868 int ignore_non_trailer(const char *buf
, size_t len
)
1872 int in_old_conflicts_block
= 0;
1873 size_t cutoff
= wt_status_locate_end(buf
, len
);
1875 while (bol
< cutoff
) {
1876 const char *next_line
= memchr(buf
+ bol
, '\n', len
- bol
);
1879 next_line
= buf
+ len
;
1883 if (buf
[bol
] == comment_line_char
|| buf
[bol
] == '\n') {
1884 /* is this the first of the run of comments? */
1887 /* otherwise, it is just continuing */
1888 } else if (starts_with(buf
+ bol
, "Conflicts:\n")) {
1889 in_old_conflicts_block
= 1;
1892 } else if (in_old_conflicts_block
&& buf
[bol
] == '\t') {
1893 ; /* a pathname in the conflicts block */
1895 /* the previous was not trailing comment */
1897 in_old_conflicts_block
= 0;
1899 bol
= next_line
- buf
;
1901 return boc
? len
- boc
: len
- cutoff
;