tgupdate: merge girocco base into girocco
[git/gitweb.git] / commit.c
blob856fd4aeeff654c45ba0a6149f9db2c22806e0cb
1 #include "cache.h"
2 #include "tag.h"
3 #include "commit.h"
4 #include "pkt-line.h"
5 #include "utf8.h"
6 #include "diff.h"
7 #include "revision.h"
8 #include "notes.h"
9 #include "gpg-interface.h"
10 #include "mergesort.h"
11 #include "commit-slab.h"
12 #include "prio-queue.h"
13 #include "sha1-lookup.h"
15 static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);
17 int save_commit_buffer = 1;
19 const char *commit_type = "commit";
21 struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
22 int quiet)
24 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
26 if (!obj)
27 return NULL;
28 return object_as_type(obj, OBJ_COMMIT, quiet);
31 struct commit *lookup_commit_reference(const unsigned char *sha1)
33 return lookup_commit_reference_gently(sha1, 0);
36 struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)
38 struct commit *c = lookup_commit_reference(sha1);
39 if (!c)
40 die(_("could not parse %s"), ref_name);
41 if (hashcmp(sha1, c->object.oid.hash)) {
42 warning(_("%s %s is not a commit!"),
43 ref_name, sha1_to_hex(sha1));
45 return c;
48 struct commit *lookup_commit(const unsigned char *sha1)
50 struct object *obj = lookup_object(sha1);
51 if (!obj)
52 return create_object(sha1, alloc_commit_node());
53 return object_as_type(obj, OBJ_COMMIT, 0);
56 struct commit *lookup_commit_reference_by_name(const char *name)
58 struct object_id oid;
59 struct commit *commit;
61 if (get_sha1_committish(name, oid.hash))
62 return NULL;
63 commit = lookup_commit_reference(oid.hash);
64 if (parse_commit(commit))
65 return NULL;
66 return commit;
69 static unsigned long parse_commit_date(const char *buf, const char *tail)
71 const char *dateptr;
73 if (buf + 6 >= tail)
74 return 0;
75 if (memcmp(buf, "author", 6))
76 return 0;
77 while (buf < tail && *buf++ != '\n')
78 /* nada */;
79 if (buf + 9 >= tail)
80 return 0;
81 if (memcmp(buf, "committer", 9))
82 return 0;
83 while (buf < tail && *buf++ != '>')
84 /* nada */;
85 if (buf >= tail)
86 return 0;
87 dateptr = buf;
88 while (buf < tail && *buf++ != '\n')
89 /* nada */;
90 if (buf >= tail)
91 return 0;
92 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
93 return strtoul(dateptr, NULL, 10);
96 static struct commit_graft **commit_graft;
97 static int commit_graft_alloc, commit_graft_nr;
99 static const unsigned char *commit_graft_sha1_access(size_t index, void *table)
101 struct commit_graft **commit_graft_table = table;
102 return commit_graft_table[index]->oid.hash;
105 static int commit_graft_pos(const unsigned char *sha1)
107 return sha1_pos(sha1, commit_graft, commit_graft_nr,
108 commit_graft_sha1_access);
111 int register_commit_graft(struct commit_graft *graft, int ignore_dups)
113 int pos = commit_graft_pos(graft->oid.hash);
115 if (0 <= pos) {
116 if (ignore_dups)
117 free(graft);
118 else {
119 free(commit_graft[pos]);
120 commit_graft[pos] = graft;
122 return 1;
124 pos = -pos - 1;
125 ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);
126 commit_graft_nr++;
127 if (pos < commit_graft_nr)
128 memmove(commit_graft + pos + 1,
129 commit_graft + pos,
130 (commit_graft_nr - pos - 1) *
131 sizeof(*commit_graft));
132 commit_graft[pos] = graft;
133 return 0;
136 struct commit_graft *read_graft_line(char *buf, int len)
138 /* The format is just "Commit Parent1 Parent2 ...\n" */
139 int i;
140 struct commit_graft *graft = NULL;
141 const int entry_size = GIT_SHA1_HEXSZ + 1;
143 while (len && isspace(buf[len-1]))
144 buf[--len] = '\0';
145 if (buf[0] == '#' || buf[0] == '\0')
146 return NULL;
147 if ((len + 1) % entry_size)
148 goto bad_graft_data;
149 i = (len + 1) / entry_size - 1;
150 graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));
151 graft->nr_parent = i;
152 if (get_oid_hex(buf, &graft->oid))
153 goto bad_graft_data;
154 for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {
155 if (buf[i] != ' ')
156 goto bad_graft_data;
157 if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))
158 goto bad_graft_data;
160 return graft;
162 bad_graft_data:
163 error("bad graft data: %s", buf);
164 free(graft);
165 return NULL;
168 static int read_graft_file(const char *graft_file)
170 FILE *fp = fopen(graft_file, "r");
171 struct strbuf buf = STRBUF_INIT;
172 if (!fp)
173 return -1;
174 while (!strbuf_getwholeline(&buf, fp, '\n')) {
175 /* The format is just "Commit Parent1 Parent2 ...\n" */
176 struct commit_graft *graft = read_graft_line(buf.buf, buf.len);
177 if (!graft)
178 continue;
179 if (register_commit_graft(graft, 1))
180 error("duplicate graft data: %s", buf.buf);
182 fclose(fp);
183 strbuf_release(&buf);
184 return 0;
187 static void prepare_commit_graft(void)
189 static int commit_graft_prepared;
190 char *graft_file;
192 if (commit_graft_prepared)
193 return;
194 graft_file = get_graft_file();
195 read_graft_file(graft_file);
196 /* make sure shallows are read */
197 is_repository_shallow();
198 commit_graft_prepared = 1;
201 struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
203 int pos;
204 prepare_commit_graft();
205 pos = commit_graft_pos(sha1);
206 if (pos < 0)
207 return NULL;
208 return commit_graft[pos];
211 int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)
213 int i, ret;
214 for (i = ret = 0; i < commit_graft_nr && !ret; i++)
215 ret = fn(commit_graft[i], cb_data);
216 return ret;
219 int unregister_shallow(const unsigned char *sha1)
221 int pos = commit_graft_pos(sha1);
222 if (pos < 0)
223 return -1;
224 if (pos + 1 < commit_graft_nr)
225 memmove(commit_graft + pos, commit_graft + pos + 1,
226 sizeof(struct commit_graft *)
227 * (commit_graft_nr - pos - 1));
228 commit_graft_nr--;
229 return 0;
232 struct commit_buffer {
233 void *buffer;
234 unsigned long size;
236 define_commit_slab(buffer_slab, struct commit_buffer);
237 static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);
239 void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)
241 struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);
242 v->buffer = buffer;
243 v->size = size;
246 const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)
248 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
249 if (!v) {
250 if (sizep)
251 *sizep = 0;
252 return NULL;
254 if (sizep)
255 *sizep = v->size;
256 return v->buffer;
259 const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)
261 const void *ret = get_cached_commit_buffer(commit, sizep);
262 if (!ret) {
263 enum object_type type;
264 unsigned long size;
265 ret = read_sha1_file(commit->object.oid.hash, &type, &size);
266 if (!ret)
267 die("cannot read commit object %s",
268 oid_to_hex(&commit->object.oid));
269 if (type != OBJ_COMMIT)
270 die("expected commit for %s, got %s",
271 oid_to_hex(&commit->object.oid), typename(type));
272 if (sizep)
273 *sizep = size;
275 return ret;
278 void unuse_commit_buffer(const struct commit *commit, const void *buffer)
280 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
281 if (!(v && v->buffer == buffer))
282 free((void *)buffer);
285 void free_commit_buffer(struct commit *commit)
287 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
288 if (v) {
289 free(v->buffer);
290 v->buffer = NULL;
291 v->size = 0;
295 const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)
297 struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);
298 void *ret;
300 if (!v) {
301 if (sizep)
302 *sizep = 0;
303 return NULL;
305 ret = v->buffer;
306 if (sizep)
307 *sizep = v->size;
309 v->buffer = NULL;
310 v->size = 0;
311 return ret;
314 int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)
316 const char *tail = buffer;
317 const char *bufptr = buffer;
318 struct object_id parent;
319 struct commit_list **pptr;
320 struct commit_graft *graft;
321 const int tree_entry_len = GIT_SHA1_HEXSZ + 5;
322 const int parent_entry_len = GIT_SHA1_HEXSZ + 7;
324 if (item->object.parsed)
325 return 0;
326 item->object.parsed = 1;
327 tail += size;
328 if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||
329 bufptr[tree_entry_len] != '\n')
330 return error("bogus commit object %s", oid_to_hex(&item->object.oid));
331 if (get_sha1_hex(bufptr + 5, parent.hash) < 0)
332 return error("bad tree pointer in commit %s",
333 oid_to_hex(&item->object.oid));
334 item->tree = lookup_tree(parent.hash);
335 bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */
336 pptr = &item->parents;
338 graft = lookup_commit_graft(item->object.oid.hash);
339 while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {
340 struct commit *new_parent;
342 if (tail <= bufptr + parent_entry_len + 1 ||
343 get_sha1_hex(bufptr + 7, parent.hash) ||
344 bufptr[parent_entry_len] != '\n')
345 return error("bad parents in commit %s", oid_to_hex(&item->object.oid));
346 bufptr += parent_entry_len + 1;
348 * The clone is shallow if nr_parent < 0, and we must
349 * not traverse its real parents even when we unhide them.
351 if (graft && (graft->nr_parent < 0 || grafts_replace_parents))
352 continue;
353 new_parent = lookup_commit(parent.hash);
354 if (new_parent)
355 pptr = &commit_list_insert(new_parent, pptr)->next;
357 if (graft) {
358 int i;
359 struct commit *new_parent;
360 for (i = 0; i < graft->nr_parent; i++) {
361 new_parent = lookup_commit(graft->parent[i].hash);
362 if (!new_parent)
363 continue;
364 pptr = &commit_list_insert(new_parent, pptr)->next;
367 item->date = parse_commit_date(bufptr, tail);
369 return 0;
372 int parse_commit_gently(struct commit *item, int quiet_on_missing)
374 enum object_type type;
375 void *buffer;
376 unsigned long size;
377 int ret;
379 if (!item)
380 return -1;
381 if (item->object.parsed)
382 return 0;
383 buffer = read_sha1_file(item->object.oid.hash, &type, &size);
384 if (!buffer)
385 return quiet_on_missing ? -1 :
386 error("Could not read %s",
387 oid_to_hex(&item->object.oid));
388 if (type != OBJ_COMMIT) {
389 free(buffer);
390 return error("Object %s not a commit",
391 oid_to_hex(&item->object.oid));
393 ret = parse_commit_buffer(item, buffer, size);
394 if (save_commit_buffer && !ret) {
395 set_commit_buffer(item, buffer, size);
396 return 0;
398 free(buffer);
399 return ret;
402 void parse_commit_or_die(struct commit *item)
404 if (parse_commit(item))
405 die("unable to parse commit %s",
406 item ? oid_to_hex(&item->object.oid) : "(null)");
409 int find_commit_subject(const char *commit_buffer, const char **subject)
411 const char *eol;
412 const char *p = commit_buffer;
414 while (*p && (*p != '\n' || p[1] != '\n'))
415 p++;
416 if (*p) {
417 p = skip_blank_lines(p + 2);
418 for (eol = p; *eol && *eol != '\n'; eol++)
419 ; /* do nothing */
420 } else
421 eol = p;
423 *subject = p;
425 return eol - p;
428 struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
430 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
431 new_list->item = item;
432 new_list->next = *list_p;
433 *list_p = new_list;
434 return new_list;
437 unsigned commit_list_count(const struct commit_list *l)
439 unsigned c = 0;
440 for (; l; l = l->next )
441 c++;
442 return c;
445 struct commit_list *copy_commit_list(struct commit_list *list)
447 struct commit_list *head = NULL;
448 struct commit_list **pp = &head;
449 while (list) {
450 pp = commit_list_append(list->item, pp);
451 list = list->next;
453 return head;
456 void free_commit_list(struct commit_list *list)
458 while (list)
459 pop_commit(&list);
462 struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)
464 struct commit_list **pp = list;
465 struct commit_list *p;
466 while ((p = *pp) != NULL) {
467 if (p->item->date < item->date) {
468 break;
470 pp = &p->next;
472 return commit_list_insert(item, pp);
475 static int commit_list_compare_by_date(const void *a, const void *b)
477 unsigned long a_date = ((const struct commit_list *)a)->item->date;
478 unsigned long b_date = ((const struct commit_list *)b)->item->date;
479 if (a_date < b_date)
480 return 1;
481 if (a_date > b_date)
482 return -1;
483 return 0;
486 static void *commit_list_get_next(const void *a)
488 return ((const struct commit_list *)a)->next;
491 static void commit_list_set_next(void *a, void *next)
493 ((struct commit_list *)a)->next = next;
496 void commit_list_sort_by_date(struct commit_list **list)
498 *list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,
499 commit_list_compare_by_date);
502 struct commit *pop_most_recent_commit(struct commit_list **list,
503 unsigned int mark)
505 struct commit *ret = pop_commit(list);
506 struct commit_list *parents = ret->parents;
508 while (parents) {
509 struct commit *commit = parents->item;
510 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
511 commit->object.flags |= mark;
512 commit_list_insert_by_date(commit, list);
514 parents = parents->next;
516 return ret;
519 static void clear_commit_marks_1(struct commit_list **plist,
520 struct commit *commit, unsigned int mark)
522 while (commit) {
523 struct commit_list *parents;
525 if (!(mark & commit->object.flags))
526 return;
528 commit->object.flags &= ~mark;
530 parents = commit->parents;
531 if (!parents)
532 return;
534 while ((parents = parents->next))
535 commit_list_insert(parents->item, plist);
537 commit = commit->parents->item;
541 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)
543 struct commit_list *list = NULL;
545 while (nr--) {
546 commit_list_insert(*commit, &list);
547 commit++;
549 while (list)
550 clear_commit_marks_1(&list, pop_commit(&list), mark);
553 void clear_commit_marks(struct commit *commit, unsigned int mark)
555 clear_commit_marks_many(1, &commit, mark);
558 void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)
560 struct object *object;
561 struct commit *commit;
562 unsigned int i;
564 for (i = 0; i < a->nr; i++) {
565 object = a->objects[i].item;
566 commit = lookup_commit_reference_gently(object->oid.hash, 1);
567 if (commit)
568 clear_commit_marks(commit, mark);
572 struct commit *pop_commit(struct commit_list **stack)
574 struct commit_list *top = *stack;
575 struct commit *item = top ? top->item : NULL;
577 if (top) {
578 *stack = top->next;
579 free(top);
581 return item;
585 * Topological sort support
588 /* count number of children that have not been emitted */
589 define_commit_slab(indegree_slab, int);
591 /* record author-date for each commit object */
592 define_commit_slab(author_date_slab, unsigned long);
594 static void record_author_date(struct author_date_slab *author_date,
595 struct commit *commit)
597 const char *buffer = get_commit_buffer(commit, NULL);
598 struct ident_split ident;
599 const char *ident_line;
600 size_t ident_len;
601 char *date_end;
602 unsigned long date;
604 ident_line = find_commit_header(buffer, "author", &ident_len);
605 if (!ident_line)
606 goto fail_exit; /* no author line */
607 if (split_ident_line(&ident, ident_line, ident_len) ||
608 !ident.date_begin || !ident.date_end)
609 goto fail_exit; /* malformed "author" line */
611 date = strtoul(ident.date_begin, &date_end, 10);
612 if (date_end != ident.date_end)
613 goto fail_exit; /* malformed date */
614 *(author_date_slab_at(author_date, commit)) = date;
616 fail_exit:
617 unuse_commit_buffer(commit, buffer);
620 static int compare_commits_by_author_date(const void *a_, const void *b_,
621 void *cb_data)
623 const struct commit *a = a_, *b = b_;
624 struct author_date_slab *author_date = cb_data;
625 unsigned long a_date = *(author_date_slab_at(author_date, a));
626 unsigned long b_date = *(author_date_slab_at(author_date, b));
628 /* newer commits with larger date first */
629 if (a_date < b_date)
630 return 1;
631 else if (a_date > b_date)
632 return -1;
633 return 0;
636 int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)
638 const struct commit *a = a_, *b = b_;
639 /* newer commits with larger date first */
640 if (a->date < b->date)
641 return 1;
642 else if (a->date > b->date)
643 return -1;
644 return 0;
648 * Performs an in-place topological sort on the list supplied.
650 void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)
652 struct commit_list *next, *orig = *list;
653 struct commit_list **pptr;
654 struct indegree_slab indegree;
655 struct prio_queue queue;
656 struct commit *commit;
657 struct author_date_slab author_date;
659 if (!orig)
660 return;
661 *list = NULL;
663 init_indegree_slab(&indegree);
664 memset(&queue, '\0', sizeof(queue));
666 switch (sort_order) {
667 default: /* REV_SORT_IN_GRAPH_ORDER */
668 queue.compare = NULL;
669 break;
670 case REV_SORT_BY_COMMIT_DATE:
671 queue.compare = compare_commits_by_commit_date;
672 break;
673 case REV_SORT_BY_AUTHOR_DATE:
674 init_author_date_slab(&author_date);
675 queue.compare = compare_commits_by_author_date;
676 queue.cb_data = &author_date;
677 break;
680 /* Mark them and clear the indegree */
681 for (next = orig; next; next = next->next) {
682 struct commit *commit = next->item;
683 *(indegree_slab_at(&indegree, commit)) = 1;
684 /* also record the author dates, if needed */
685 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
686 record_author_date(&author_date, commit);
689 /* update the indegree */
690 for (next = orig; next; next = next->next) {
691 struct commit_list *parents = next->item->parents;
692 while (parents) {
693 struct commit *parent = parents->item;
694 int *pi = indegree_slab_at(&indegree, parent);
696 if (*pi)
697 (*pi)++;
698 parents = parents->next;
703 * find the tips
705 * tips are nodes not reachable from any other node in the list
707 * the tips serve as a starting set for the work queue.
709 for (next = orig; next; next = next->next) {
710 struct commit *commit = next->item;
712 if (*(indegree_slab_at(&indegree, commit)) == 1)
713 prio_queue_put(&queue, commit);
717 * This is unfortunate; the initial tips need to be shown
718 * in the order given from the revision traversal machinery.
720 if (sort_order == REV_SORT_IN_GRAPH_ORDER)
721 prio_queue_reverse(&queue);
723 /* We no longer need the commit list */
724 free_commit_list(orig);
726 pptr = list;
727 *list = NULL;
728 while ((commit = prio_queue_get(&queue)) != NULL) {
729 struct commit_list *parents;
731 for (parents = commit->parents; parents ; parents = parents->next) {
732 struct commit *parent = parents->item;
733 int *pi = indegree_slab_at(&indegree, parent);
735 if (!*pi)
736 continue;
739 * parents are only enqueued for emission
740 * when all their children have been emitted thereby
741 * guaranteeing topological order.
743 if (--(*pi) == 1)
744 prio_queue_put(&queue, parent);
747 * all children of commit have already been
748 * emitted. we can emit it now.
750 *(indegree_slab_at(&indegree, commit)) = 0;
752 pptr = &commit_list_insert(commit, pptr)->next;
755 clear_indegree_slab(&indegree);
756 clear_prio_queue(&queue);
757 if (sort_order == REV_SORT_BY_AUTHOR_DATE)
758 clear_author_date_slab(&author_date);
761 /* merge-base stuff */
763 /* Remember to update object flag allocation in object.h */
764 #define PARENT1 (1u<<16)
765 #define PARENT2 (1u<<17)
766 #define STALE (1u<<18)
767 #define RESULT (1u<<19)
769 static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
771 static int queue_has_nonstale(struct prio_queue *queue)
773 int i;
774 for (i = 0; i < queue->nr; i++) {
775 struct commit *commit = queue->array[i].data;
776 if (!(commit->object.flags & STALE))
777 return 1;
779 return 0;
782 /* all input commits in one and twos[] must have been parsed! */
783 static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)
785 struct prio_queue queue = { compare_commits_by_commit_date };
786 struct commit_list *result = NULL;
787 int i;
789 one->object.flags |= PARENT1;
790 if (!n) {
791 commit_list_append(one, &result);
792 return result;
794 prio_queue_put(&queue, one);
796 for (i = 0; i < n; i++) {
797 twos[i]->object.flags |= PARENT2;
798 prio_queue_put(&queue, twos[i]);
801 while (queue_has_nonstale(&queue)) {
802 struct commit *commit = prio_queue_get(&queue);
803 struct commit_list *parents;
804 int flags;
806 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
807 if (flags == (PARENT1 | PARENT2)) {
808 if (!(commit->object.flags & RESULT)) {
809 commit->object.flags |= RESULT;
810 commit_list_insert_by_date(commit, &result);
812 /* Mark parents of a found merge stale */
813 flags |= STALE;
815 parents = commit->parents;
816 while (parents) {
817 struct commit *p = parents->item;
818 parents = parents->next;
819 if ((p->object.flags & flags) == flags)
820 continue;
821 if (parse_commit(p))
822 return NULL;
823 p->object.flags |= flags;
824 prio_queue_put(&queue, p);
828 clear_prio_queue(&queue);
829 return result;
832 static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
834 struct commit_list *list = NULL;
835 struct commit_list *result = NULL;
836 int i;
838 for (i = 0; i < n; i++) {
839 if (one == twos[i])
841 * We do not mark this even with RESULT so we do not
842 * have to clean it up.
844 return commit_list_insert(one, &result);
847 if (parse_commit(one))
848 return NULL;
849 for (i = 0; i < n; i++) {
850 if (parse_commit(twos[i]))
851 return NULL;
854 list = paint_down_to_common(one, n, twos);
856 while (list) {
857 struct commit *commit = pop_commit(&list);
858 if (!(commit->object.flags & STALE))
859 commit_list_insert_by_date(commit, &result);
861 return result;
864 struct commit_list *get_octopus_merge_bases(struct commit_list *in)
866 struct commit_list *i, *j, *k, *ret = NULL;
868 if (!in)
869 return ret;
871 commit_list_insert(in->item, &ret);
873 for (i = in->next; i; i = i->next) {
874 struct commit_list *new = NULL, *end = NULL;
876 for (j = ret; j; j = j->next) {
877 struct commit_list *bases;
878 bases = get_merge_bases(i->item, j->item);
879 if (!new)
880 new = bases;
881 else
882 end->next = bases;
883 for (k = bases; k; k = k->next)
884 end = k;
886 ret = new;
888 return ret;
891 static int remove_redundant(struct commit **array, int cnt)
894 * Some commit in the array may be an ancestor of
895 * another commit. Move such commit to the end of
896 * the array, and return the number of commits that
897 * are independent from each other.
899 struct commit **work;
900 unsigned char *redundant;
901 int *filled_index;
902 int i, j, filled;
904 work = xcalloc(cnt, sizeof(*work));
905 redundant = xcalloc(cnt, 1);
906 ALLOC_ARRAY(filled_index, cnt - 1);
908 for (i = 0; i < cnt; i++)
909 parse_commit(array[i]);
910 for (i = 0; i < cnt; i++) {
911 struct commit_list *common;
913 if (redundant[i])
914 continue;
915 for (j = filled = 0; j < cnt; j++) {
916 if (i == j || redundant[j])
917 continue;
918 filled_index[filled] = j;
919 work[filled++] = array[j];
921 common = paint_down_to_common(array[i], filled, work);
922 if (array[i]->object.flags & PARENT2)
923 redundant[i] = 1;
924 for (j = 0; j < filled; j++)
925 if (work[j]->object.flags & PARENT1)
926 redundant[filled_index[j]] = 1;
927 clear_commit_marks(array[i], all_flags);
928 for (j = 0; j < filled; j++)
929 clear_commit_marks(work[j], all_flags);
930 free_commit_list(common);
933 /* Now collect the result */
934 COPY_ARRAY(work, array, cnt);
935 for (i = filled = 0; i < cnt; i++)
936 if (!redundant[i])
937 array[filled++] = work[i];
938 for (j = filled, i = 0; i < cnt; i++)
939 if (redundant[i])
940 array[j++] = work[i];
941 free(work);
942 free(redundant);
943 free(filled_index);
944 return filled;
947 static struct commit_list *get_merge_bases_many_0(struct commit *one,
948 int n,
949 struct commit **twos,
950 int cleanup)
952 struct commit_list *list;
953 struct commit **rslt;
954 struct commit_list *result;
955 int cnt, i;
957 result = merge_bases_many(one, n, twos);
958 for (i = 0; i < n; i++) {
959 if (one == twos[i])
960 return result;
962 if (!result || !result->next) {
963 if (cleanup) {
964 clear_commit_marks(one, all_flags);
965 clear_commit_marks_many(n, twos, all_flags);
967 return result;
970 /* There are more than one */
971 cnt = commit_list_count(result);
972 rslt = xcalloc(cnt, sizeof(*rslt));
973 for (list = result, i = 0; list; list = list->next)
974 rslt[i++] = list->item;
975 free_commit_list(result);
977 clear_commit_marks(one, all_flags);
978 clear_commit_marks_many(n, twos, all_flags);
980 cnt = remove_redundant(rslt, cnt);
981 result = NULL;
982 for (i = 0; i < cnt; i++)
983 commit_list_insert_by_date(rslt[i], &result);
984 free(rslt);
985 return result;
988 struct commit_list *get_merge_bases_many(struct commit *one,
989 int n,
990 struct commit **twos)
992 return get_merge_bases_many_0(one, n, twos, 1);
995 struct commit_list *get_merge_bases_many_dirty(struct commit *one,
996 int n,
997 struct commit **twos)
999 return get_merge_bases_many_0(one, n, twos, 0);
1002 struct commit_list *get_merge_bases(struct commit *one, struct commit *two)
1004 return get_merge_bases_many_0(one, 1, &two, 1);
1008 * Is "commit" a descendant of one of the elements on the "with_commit" list?
1010 int is_descendant_of(struct commit *commit, struct commit_list *with_commit)
1012 if (!with_commit)
1013 return 1;
1014 while (with_commit) {
1015 struct commit *other;
1017 other = with_commit->item;
1018 with_commit = with_commit->next;
1019 if (in_merge_bases(other, commit))
1020 return 1;
1022 return 0;
1026 * Is "commit" an ancestor of one of the "references"?
1028 int in_merge_bases_many(struct commit *commit, int nr_reference, struct commit **reference)
1030 struct commit_list *bases;
1031 int ret = 0, i;
1033 if (parse_commit(commit))
1034 return ret;
1035 for (i = 0; i < nr_reference; i++)
1036 if (parse_commit(reference[i]))
1037 return ret;
1039 bases = paint_down_to_common(commit, nr_reference, reference);
1040 if (commit->object.flags & PARENT2)
1041 ret = 1;
1042 clear_commit_marks(commit, all_flags);
1043 clear_commit_marks_many(nr_reference, reference, all_flags);
1044 free_commit_list(bases);
1045 return ret;
1049 * Is "commit" an ancestor of (i.e. reachable from) the "reference"?
1051 int in_merge_bases(struct commit *commit, struct commit *reference)
1053 return in_merge_bases_many(commit, 1, &reference);
1056 struct commit_list *reduce_heads(struct commit_list *heads)
1058 struct commit_list *p;
1059 struct commit_list *result = NULL, **tail = &result;
1060 struct commit **array;
1061 int num_head, i;
1063 if (!heads)
1064 return NULL;
1066 /* Uniquify */
1067 for (p = heads; p; p = p->next)
1068 p->item->object.flags &= ~STALE;
1069 for (p = heads, num_head = 0; p; p = p->next) {
1070 if (p->item->object.flags & STALE)
1071 continue;
1072 p->item->object.flags |= STALE;
1073 num_head++;
1075 array = xcalloc(num_head, sizeof(*array));
1076 for (p = heads, i = 0; p; p = p->next) {
1077 if (p->item->object.flags & STALE) {
1078 array[i++] = p->item;
1079 p->item->object.flags &= ~STALE;
1082 num_head = remove_redundant(array, num_head);
1083 for (i = 0; i < num_head; i++)
1084 tail = &commit_list_insert(array[i], tail)->next;
1085 return result;
1088 static const char gpg_sig_header[] = "gpgsig";
1089 static const int gpg_sig_header_len = sizeof(gpg_sig_header) - 1;
1091 static int do_sign_commit(struct strbuf *buf, const char *keyid)
1093 struct strbuf sig = STRBUF_INIT;
1094 int inspos, copypos;
1095 const char *eoh;
1097 /* find the end of the header */
1098 eoh = strstr(buf->buf, "\n\n");
1099 if (!eoh)
1100 inspos = buf->len;
1101 else
1102 inspos = eoh - buf->buf + 1;
1104 if (!keyid || !*keyid)
1105 keyid = get_signing_key();
1106 if (sign_buffer(buf, &sig, keyid)) {
1107 strbuf_release(&sig);
1108 return -1;
1111 for (copypos = 0; sig.buf[copypos]; ) {
1112 const char *bol = sig.buf + copypos;
1113 const char *eol = strchrnul(bol, '\n');
1114 int len = (eol - bol) + !!*eol;
1116 if (!copypos) {
1117 strbuf_insert(buf, inspos, gpg_sig_header, gpg_sig_header_len);
1118 inspos += gpg_sig_header_len;
1120 strbuf_insert(buf, inspos++, " ", 1);
1121 strbuf_insert(buf, inspos, bol, len);
1122 inspos += len;
1123 copypos += len;
1125 strbuf_release(&sig);
1126 return 0;
1129 int parse_signed_commit(const struct commit *commit,
1130 struct strbuf *payload, struct strbuf *signature)
1133 unsigned long size;
1134 const char *buffer = get_commit_buffer(commit, &size);
1135 int in_signature, saw_signature = -1;
1136 const char *line, *tail;
1138 line = buffer;
1139 tail = buffer + size;
1140 in_signature = 0;
1141 saw_signature = 0;
1142 while (line < tail) {
1143 const char *sig = NULL;
1144 const char *next = memchr(line, '\n', tail - line);
1146 next = next ? next + 1 : tail;
1147 if (in_signature && line[0] == ' ')
1148 sig = line + 1;
1149 else if (starts_with(line, gpg_sig_header) &&
1150 line[gpg_sig_header_len] == ' ')
1151 sig = line + gpg_sig_header_len + 1;
1152 if (sig) {
1153 strbuf_add(signature, sig, next - sig);
1154 saw_signature = 1;
1155 in_signature = 1;
1156 } else {
1157 if (*line == '\n')
1158 /* dump the whole remainder of the buffer */
1159 next = tail;
1160 strbuf_add(payload, line, next - line);
1161 in_signature = 0;
1163 line = next;
1165 unuse_commit_buffer(commit, buffer);
1166 return saw_signature;
1169 int remove_signature(struct strbuf *buf)
1171 const char *line = buf->buf;
1172 const char *tail = buf->buf + buf->len;
1173 int in_signature = 0;
1174 const char *sig_start = NULL;
1175 const char *sig_end = NULL;
1177 while (line < tail) {
1178 const char *next = memchr(line, '\n', tail - line);
1179 next = next ? next + 1 : tail;
1181 if (in_signature && line[0] == ' ')
1182 sig_end = next;
1183 else if (starts_with(line, gpg_sig_header) &&
1184 line[gpg_sig_header_len] == ' ') {
1185 sig_start = line;
1186 sig_end = next;
1187 in_signature = 1;
1188 } else {
1189 if (*line == '\n')
1190 /* dump the whole remainder of the buffer */
1191 next = tail;
1192 in_signature = 0;
1194 line = next;
1197 if (sig_start)
1198 strbuf_remove(buf, sig_start - buf->buf, sig_end - sig_start);
1200 return sig_start != NULL;
1203 static void handle_signed_tag(struct commit *parent, struct commit_extra_header ***tail)
1205 struct merge_remote_desc *desc;
1206 struct commit_extra_header *mergetag;
1207 char *buf;
1208 unsigned long size, len;
1209 enum object_type type;
1211 desc = merge_remote_util(parent);
1212 if (!desc || !desc->obj)
1213 return;
1214 buf = read_sha1_file(desc->obj->oid.hash, &type, &size);
1215 if (!buf || type != OBJ_TAG)
1216 goto free_return;
1217 len = parse_signature(buf, size);
1218 if (size == len)
1219 goto free_return;
1221 * We could verify this signature and either omit the tag when
1222 * it does not validate, but the integrator may not have the
1223 * public key of the signer of the tag he is merging, while a
1224 * later auditor may have it while auditing, so let's not run
1225 * verify-signed-buffer here for now...
1227 * if (verify_signed_buffer(buf, len, buf + len, size - len, ...))
1228 * warn("warning: signed tag unverified.");
1230 mergetag = xcalloc(1, sizeof(*mergetag));
1231 mergetag->key = xstrdup("mergetag");
1232 mergetag->value = buf;
1233 mergetag->len = size;
1235 **tail = mergetag;
1236 *tail = &mergetag->next;
1237 return;
1239 free_return:
1240 free(buf);
1243 int check_commit_signature(const struct commit *commit, struct signature_check *sigc)
1245 struct strbuf payload = STRBUF_INIT;
1246 struct strbuf signature = STRBUF_INIT;
1247 int ret = 1;
1249 sigc->result = 'N';
1251 if (parse_signed_commit(commit, &payload, &signature) <= 0)
1252 goto out;
1253 ret = check_signature(payload.buf, payload.len, signature.buf,
1254 signature.len, sigc);
1256 out:
1257 strbuf_release(&payload);
1258 strbuf_release(&signature);
1260 return ret;
1265 void append_merge_tag_headers(struct commit_list *parents,
1266 struct commit_extra_header ***tail)
1268 while (parents) {
1269 struct commit *parent = parents->item;
1270 handle_signed_tag(parent, tail);
1271 parents = parents->next;
1275 static void add_extra_header(struct strbuf *buffer,
1276 struct commit_extra_header *extra)
1278 strbuf_addstr(buffer, extra->key);
1279 if (extra->len)
1280 strbuf_add_lines(buffer, " ", extra->value, extra->len);
1281 else
1282 strbuf_addch(buffer, '\n');
1285 struct commit_extra_header *read_commit_extra_headers(struct commit *commit,
1286 const char **exclude)
1288 struct commit_extra_header *extra = NULL;
1289 unsigned long size;
1290 const char *buffer = get_commit_buffer(commit, &size);
1291 extra = read_commit_extra_header_lines(buffer, size, exclude);
1292 unuse_commit_buffer(commit, buffer);
1293 return extra;
1296 void for_each_mergetag(each_mergetag_fn fn, struct commit *commit, void *data)
1298 struct commit_extra_header *extra, *to_free;
1300 to_free = read_commit_extra_headers(commit, NULL);
1301 for (extra = to_free; extra; extra = extra->next) {
1302 if (strcmp(extra->key, "mergetag"))
1303 continue; /* not a merge tag */
1304 fn(commit, extra, data);
1306 free_commit_extra_headers(to_free);
1309 static inline int standard_header_field(const char *field, size_t len)
1311 return ((len == 4 && !memcmp(field, "tree ", 5)) ||
1312 (len == 6 && !memcmp(field, "parent ", 7)) ||
1313 (len == 6 && !memcmp(field, "author ", 7)) ||
1314 (len == 9 && !memcmp(field, "committer ", 10)) ||
1315 (len == 8 && !memcmp(field, "encoding ", 9)));
1318 static int excluded_header_field(const char *field, size_t len, const char **exclude)
1320 if (!exclude)
1321 return 0;
1323 while (*exclude) {
1324 size_t xlen = strlen(*exclude);
1325 if (len == xlen &&
1326 !memcmp(field, *exclude, xlen) && field[xlen] == ' ')
1327 return 1;
1328 exclude++;
1330 return 0;
1333 static struct commit_extra_header *read_commit_extra_header_lines(
1334 const char *buffer, size_t size,
1335 const char **exclude)
1337 struct commit_extra_header *extra = NULL, **tail = &extra, *it = NULL;
1338 const char *line, *next, *eof, *eob;
1339 struct strbuf buf = STRBUF_INIT;
1341 for (line = buffer, eob = line + size;
1342 line < eob && *line != '\n';
1343 line = next) {
1344 next = memchr(line, '\n', eob - line);
1345 next = next ? next + 1 : eob;
1346 if (*line == ' ') {
1347 /* continuation */
1348 if (it)
1349 strbuf_add(&buf, line + 1, next - (line + 1));
1350 continue;
1352 if (it)
1353 it->value = strbuf_detach(&buf, &it->len);
1354 strbuf_reset(&buf);
1355 it = NULL;
1357 eof = strchr(line, ' ');
1358 if (next <= eof)
1359 eof = next;
1361 if (standard_header_field(line, eof - line) ||
1362 excluded_header_field(line, eof - line, exclude))
1363 continue;
1365 it = xcalloc(1, sizeof(*it));
1366 it->key = xmemdupz(line, eof-line);
1367 *tail = it;
1368 tail = &it->next;
1369 if (eof + 1 < next)
1370 strbuf_add(&buf, eof + 1, next - (eof + 1));
1372 if (it)
1373 it->value = strbuf_detach(&buf, &it->len);
1374 return extra;
1377 void free_commit_extra_headers(struct commit_extra_header *extra)
1379 while (extra) {
1380 struct commit_extra_header *next = extra->next;
1381 free(extra->key);
1382 free(extra->value);
1383 free(extra);
1384 extra = next;
1388 int commit_tree(const char *msg, size_t msg_len,
1389 const unsigned char *tree,
1390 struct commit_list *parents, unsigned char *ret,
1391 const char *author, const char *sign_commit)
1393 struct commit_extra_header *extra = NULL, **tail = &extra;
1394 int result;
1396 append_merge_tag_headers(parents, &tail);
1397 result = commit_tree_extended(msg, msg_len, tree, parents, ret,
1398 author, sign_commit, extra);
1399 free_commit_extra_headers(extra);
1400 return result;
1403 static int find_invalid_utf8(const char *buf, int len)
1405 int offset = 0;
1406 static const unsigned int max_codepoint[] = {
1407 0x7f, 0x7ff, 0xffff, 0x10ffff
1410 while (len) {
1411 unsigned char c = *buf++;
1412 int bytes, bad_offset;
1413 unsigned int codepoint;
1414 unsigned int min_val, max_val;
1416 len--;
1417 offset++;
1419 /* Simple US-ASCII? No worries. */
1420 if (c < 0x80)
1421 continue;
1423 bad_offset = offset-1;
1426 * Count how many more high bits set: that's how
1427 * many more bytes this sequence should have.
1429 bytes = 0;
1430 while (c & 0x40) {
1431 c <<= 1;
1432 bytes++;
1436 * Must be between 1 and 3 more bytes. Longer sequences result in
1437 * codepoints beyond U+10FFFF, which are guaranteed never to exist.
1439 if (bytes < 1 || 3 < bytes)
1440 return bad_offset;
1442 /* Do we *have* that many bytes? */
1443 if (len < bytes)
1444 return bad_offset;
1447 * Place the encoded bits at the bottom of the value and compute the
1448 * valid range.
1450 codepoint = (c & 0x7f) >> bytes;
1451 min_val = max_codepoint[bytes-1] + 1;
1452 max_val = max_codepoint[bytes];
1454 offset += bytes;
1455 len -= bytes;
1457 /* And verify that they are good continuation bytes */
1458 do {
1459 codepoint <<= 6;
1460 codepoint |= *buf & 0x3f;
1461 if ((*buf++ & 0xc0) != 0x80)
1462 return bad_offset;
1463 } while (--bytes);
1465 /* Reject codepoints that are out of range for the sequence length. */
1466 if (codepoint < min_val || codepoint > max_val)
1467 return bad_offset;
1468 /* Surrogates are only for UTF-16 and cannot be encoded in UTF-8. */
1469 if ((codepoint & 0x1ff800) == 0xd800)
1470 return bad_offset;
1471 /* U+xxFFFE and U+xxFFFF are guaranteed non-characters. */
1472 if ((codepoint & 0xfffe) == 0xfffe)
1473 return bad_offset;
1474 /* So are anything in the range U+FDD0..U+FDEF. */
1475 if (codepoint >= 0xfdd0 && codepoint <= 0xfdef)
1476 return bad_offset;
1478 return -1;
1482 * This verifies that the buffer is in proper utf8 format.
1484 * If it isn't, it assumes any non-utf8 characters are Latin1,
1485 * and does the conversion.
1487 static int verify_utf8(struct strbuf *buf)
1489 int ok = 1;
1490 long pos = 0;
1492 for (;;) {
1493 int bad;
1494 unsigned char c;
1495 unsigned char replace[2];
1497 bad = find_invalid_utf8(buf->buf + pos, buf->len - pos);
1498 if (bad < 0)
1499 return ok;
1500 pos += bad;
1501 ok = 0;
1502 c = buf->buf[pos];
1503 strbuf_remove(buf, pos, 1);
1505 /* We know 'c' must be in the range 128-255 */
1506 replace[0] = 0xc0 + (c >> 6);
1507 replace[1] = 0x80 + (c & 0x3f);
1508 strbuf_insert(buf, pos, replace, 2);
1509 pos += 2;
1513 static const char commit_utf8_warn[] =
1514 N_("Warning: commit message did not conform to UTF-8.\n"
1515 "You may want to amend it after fixing the message, or set the config\n"
1516 "variable i18n.commitencoding to the encoding your project uses.\n");
1518 int commit_tree_extended(const char *msg, size_t msg_len,
1519 const unsigned char *tree,
1520 struct commit_list *parents, unsigned char *ret,
1521 const char *author, const char *sign_commit,
1522 struct commit_extra_header *extra)
1524 int result;
1525 int encoding_is_utf8;
1526 struct strbuf buffer;
1528 assert_sha1_type(tree, OBJ_TREE);
1530 if (memchr(msg, '\0', msg_len))
1531 return error("a NUL byte in commit log message not allowed.");
1533 /* Not having i18n.commitencoding is the same as having utf-8 */
1534 encoding_is_utf8 = is_encoding_utf8(git_commit_encoding);
1536 strbuf_init(&buffer, 8192); /* should avoid reallocs for the headers */
1537 strbuf_addf(&buffer, "tree %s\n", sha1_to_hex(tree));
1540 * NOTE! This ordering means that the same exact tree merged with a
1541 * different order of parents will be a _different_ changeset even
1542 * if everything else stays the same.
1544 while (parents) {
1545 struct commit *parent = pop_commit(&parents);
1546 strbuf_addf(&buffer, "parent %s\n",
1547 oid_to_hex(&parent->object.oid));
1550 /* Person/date information */
1551 if (!author)
1552 author = git_author_info(IDENT_STRICT);
1553 strbuf_addf(&buffer, "author %s\n", author);
1554 strbuf_addf(&buffer, "committer %s\n", git_committer_info(IDENT_STRICT));
1555 if (!encoding_is_utf8)
1556 strbuf_addf(&buffer, "encoding %s\n", git_commit_encoding);
1558 while (extra) {
1559 add_extra_header(&buffer, extra);
1560 extra = extra->next;
1562 strbuf_addch(&buffer, '\n');
1564 /* And add the comment */
1565 strbuf_add(&buffer, msg, msg_len);
1567 /* And check the encoding */
1568 if (encoding_is_utf8 && !verify_utf8(&buffer))
1569 fprintf(stderr, _(commit_utf8_warn));
1571 if (sign_commit && do_sign_commit(&buffer, sign_commit))
1572 return -1;
1574 result = write_sha1_file(buffer.buf, buffer.len, commit_type, ret);
1575 strbuf_release(&buffer);
1576 return result;
1579 void set_merge_remote_desc(struct commit *commit,
1580 const char *name, struct object *obj)
1582 struct merge_remote_desc *desc;
1583 FLEX_ALLOC_STR(desc, name, name);
1584 desc->obj = obj;
1585 commit->util = desc;
1588 struct commit *get_merge_parent(const char *name)
1590 struct object *obj;
1591 struct commit *commit;
1592 struct object_id oid;
1593 if (get_sha1(name, oid.hash))
1594 return NULL;
1595 obj = parse_object(oid.hash);
1596 commit = (struct commit *)peel_to_type(name, 0, obj, OBJ_COMMIT);
1597 if (commit && !commit->util)
1598 set_merge_remote_desc(commit, name, obj);
1599 return commit;
1603 * Append a commit to the end of the commit_list.
1605 * next starts by pointing to the variable that holds the head of an
1606 * empty commit_list, and is updated to point to the "next" field of
1607 * the last item on the list as new commits are appended.
1609 * Usage example:
1611 * struct commit_list *list;
1612 * struct commit_list **next = &list;
1614 * next = commit_list_append(c1, next);
1615 * next = commit_list_append(c2, next);
1616 * assert(commit_list_count(list) == 2);
1617 * return list;
1619 struct commit_list **commit_list_append(struct commit *commit,
1620 struct commit_list **next)
1622 struct commit_list *new = xmalloc(sizeof(struct commit_list));
1623 new->item = commit;
1624 *next = new;
1625 new->next = NULL;
1626 return &new->next;
1629 const char *find_commit_header(const char *msg, const char *key, size_t *out_len)
1631 int key_len = strlen(key);
1632 const char *line = msg;
1634 while (line) {
1635 const char *eol = strchrnul(line, '\n');
1637 if (line == eol)
1638 return NULL;
1640 if (eol - line > key_len &&
1641 !strncmp(line, key, key_len) &&
1642 line[key_len] == ' ') {
1643 *out_len = eol - line - key_len - 1;
1644 return line + key_len + 1;
1646 line = *eol ? eol + 1 : NULL;
1648 return NULL;
1652 * Inspect sb and determine the true "end" of the log message, in
1653 * order to find where to put a new Signed-off-by: line. Ignored are
1654 * trailing comment lines and blank lines, and also the traditional
1655 * "Conflicts:" block that is not commented out, so that we can use
1656 * "git commit -s --amend" on an existing commit that forgot to remove
1657 * it.
1659 * Returns the number of bytes from the tail to ignore, to be fed as
1660 * the second parameter to append_signoff().
1662 int ignore_non_trailer(struct strbuf *sb)
1664 int boc = 0;
1665 int bol = 0;
1666 int in_old_conflicts_block = 0;
1668 while (bol < sb->len) {
1669 char *next_line;
1671 if (!(next_line = memchr(sb->buf + bol, '\n', sb->len - bol)))
1672 next_line = sb->buf + sb->len;
1673 else
1674 next_line++;
1676 if (sb->buf[bol] == comment_line_char || sb->buf[bol] == '\n') {
1677 /* is this the first of the run of comments? */
1678 if (!boc)
1679 boc = bol;
1680 /* otherwise, it is just continuing */
1681 } else if (starts_with(sb->buf + bol, "Conflicts:\n")) {
1682 in_old_conflicts_block = 1;
1683 if (!boc)
1684 boc = bol;
1685 } else if (in_old_conflicts_block && sb->buf[bol] == '\t') {
1686 ; /* a pathname in the conflicts block */
1687 } else if (boc) {
1688 /* the previous was not trailing comment */
1689 boc = 0;
1690 in_old_conflicts_block = 0;
1692 bol = next_line - sb->buf;
1694 return boc ? sb->len - boc : 0;