Add test to show that show-branch misses out the 8th column
[git/git.git] / commit.c
CommitLineData
8f1d2e6f 1#include "cache.h"
961784ee 2#include "tag.h"
175785e5 3#include "commit.h"
ed09aef0 4#include "pkt-line.h"
52883fbd 5#include "utf8.h"
199c45bf
JH
6#include "diff.h"
7#include "revision.h"
175785e5 8
60ab26de
LT
9int save_commit_buffer = 1;
10
175785e5
DB
11const char *commit_type = "commit";
12
f76412ed
JH
13static struct commit *check_commit(struct object *obj,
14 const unsigned char *sha1,
15 int quiet)
961784ee 16{
1974632c 17 if (obj->type != OBJ_COMMIT) {
f76412ed
JH
18 if (!quiet)
19 error("Object %s is a %s, not a commit",
885a86ab 20 sha1_to_hex(sha1), typename(obj->type));
961784ee
LT
21 return NULL;
22 }
23 return (struct commit *) obj;
24}
25
f76412ed
JH
26struct commit *lookup_commit_reference_gently(const unsigned char *sha1,
27 int quiet)
961784ee 28{
9534f40b 29 struct object *obj = deref_tag(parse_object(sha1), NULL, 0);
961784ee
LT
30
31 if (!obj)
32 return NULL;
f76412ed
JH
33 return check_commit(obj, sha1, quiet);
34}
35
36struct commit *lookup_commit_reference(const unsigned char *sha1)
37{
38 return lookup_commit_reference_gently(sha1, 0);
961784ee
LT
39}
40
5d6ccf5c 41struct commit *lookup_commit(const unsigned char *sha1)
175785e5
DB
42{
43 struct object *obj = lookup_object(sha1);
100c5f3b
LT
44 if (!obj)
45 return create_object(sha1, OBJ_COMMIT, alloc_commit_node());
d1af002d 46 if (!obj->type)
1974632c 47 obj->type = OBJ_COMMIT;
f76412ed 48 return check_commit(obj, sha1, 0);
175785e5
DB
49}
50
0a617799 51static unsigned long parse_commit_date(const char *buf, const char *tail)
175785e5
DB
52{
53 unsigned long date;
0a617799 54 const char *dateptr;
175785e5 55
0a617799
MK
56 if (buf + 6 >= tail)
57 return 0;
175785e5
DB
58 if (memcmp(buf, "author", 6))
59 return 0;
0a617799 60 while (buf < tail && *buf++ != '\n')
175785e5 61 /* nada */;
0a617799
MK
62 if (buf + 9 >= tail)
63 return 0;
175785e5
DB
64 if (memcmp(buf, "committer", 9))
65 return 0;
0a617799 66 while (buf < tail && *buf++ != '>')
175785e5 67 /* nada */;
0a617799
MK
68 if (buf >= tail)
69 return 0;
70 dateptr = buf;
71 while (buf < tail && *buf++ != '\n')
72 /* nada */;
73 if (buf >= tail)
74 return 0;
75 /* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */
76 date = strtoul(dateptr, NULL, 10);
175785e5
DB
77 if (date == ULONG_MAX)
78 date = 0;
79 return date;
80}
81
5040f17e 82static struct commit_graft **commit_graft;
5da5c8f4
JH
83static int commit_graft_alloc, commit_graft_nr;
84
85static int commit_graft_pos(const unsigned char *sha1)
86{
87 int lo, hi;
88 lo = 0;
89 hi = commit_graft_nr;
90 while (lo < hi) {
91 int mi = (lo + hi) / 2;
92 struct commit_graft *graft = commit_graft[mi];
a89fccd2 93 int cmp = hashcmp(sha1, graft->sha1);
5da5c8f4
JH
94 if (!cmp)
95 return mi;
96 if (cmp < 0)
97 hi = mi;
98 else
99 lo = mi + 1;
100 }
101 return -lo - 1;
102}
103
5040f17e
JH
104int register_commit_graft(struct commit_graft *graft, int ignore_dups)
105{
106 int pos = commit_graft_pos(graft->sha1);
a6080a0a 107
5040f17e
JH
108 if (0 <= pos) {
109 if (ignore_dups)
110 free(graft);
111 else {
112 free(commit_graft[pos]);
113 commit_graft[pos] = graft;
114 }
115 return 1;
116 }
117 pos = -pos - 1;
118 if (commit_graft_alloc <= ++commit_graft_nr) {
119 commit_graft_alloc = alloc_nr(commit_graft_alloc);
120 commit_graft = xrealloc(commit_graft,
121 sizeof(*commit_graft) *
122 commit_graft_alloc);
123 }
124 if (pos < commit_graft_nr)
125 memmove(commit_graft + pos + 1,
126 commit_graft + pos,
127 (commit_graft_nr - pos - 1) *
128 sizeof(*commit_graft));
129 commit_graft[pos] = graft;
130 return 0;
131}
132
133struct commit_graft *read_graft_line(char *buf, int len)
134{
135 /* The format is just "Commit Parent1 Parent2 ...\n" */
136 int i;
137 struct commit_graft *graft = NULL;
138
139 if (buf[len-1] == '\n')
140 buf[--len] = 0;
360204c3 141 if (buf[0] == '#' || buf[0] == '\0')
5bc4ce58 142 return NULL;
5040f17e
JH
143 if ((len + 1) % 41) {
144 bad_graft_data:
145 error("bad graft data: %s", buf);
146 free(graft);
147 return NULL;
148 }
149 i = (len + 1) / 41 - 1;
150 graft = xmalloc(sizeof(*graft) + 20 * i);
151 graft->nr_parent = i;
152 if (get_sha1_hex(buf, graft->sha1))
153 goto bad_graft_data;
154 for (i = 40; i < len; i += 41) {
155 if (buf[i] != ' ')
156 goto bad_graft_data;
157 if (get_sha1_hex(buf + i + 1, graft->parent[i/41]))
158 goto bad_graft_data;
159 }
160 return graft;
161}
162
163int read_graft_file(const char *graft_file)
5da5c8f4 164{
5da5c8f4
JH
165 FILE *fp = fopen(graft_file, "r");
166 char buf[1024];
5040f17e
JH
167 if (!fp)
168 return -1;
5da5c8f4
JH
169 while (fgets(buf, sizeof(buf), fp)) {
170 /* The format is just "Commit Parent1 Parent2 ...\n" */
171 int len = strlen(buf);
5040f17e 172 struct commit_graft *graft = read_graft_line(buf, len);
5bc4ce58
JH
173 if (!graft)
174 continue;
5040f17e 175 if (register_commit_graft(graft, 1))
5da5c8f4 176 error("duplicate graft data: %s", buf);
5da5c8f4
JH
177 }
178 fclose(fp);
5040f17e
JH
179 return 0;
180}
181
182static void prepare_commit_graft(void)
183{
184 static int commit_graft_prepared;
185 char *graft_file;
186
187 if (commit_graft_prepared)
188 return;
189 graft_file = get_graft_file();
190 read_graft_file(graft_file);
ed09aef0
JS
191 /* make sure shallows are read */
192 is_repository_shallow();
5040f17e 193 commit_graft_prepared = 1;
5da5c8f4
JH
194}
195
45163382 196struct commit_graft *lookup_commit_graft(const unsigned char *sha1)
5da5c8f4
JH
197{
198 int pos;
5040f17e 199 prepare_commit_graft();
5da5c8f4
JH
200 pos = commit_graft_pos(sha1);
201 if (pos < 0)
202 return NULL;
203 return commit_graft[pos];
204}
205
ed09aef0
JS
206int write_shallow_commits(int fd, int use_pack_protocol)
207{
208 int i, count = 0;
209 for (i = 0; i < commit_graft_nr; i++)
210 if (commit_graft[i]->nr_parent < 0) {
211 const char *hex =
212 sha1_to_hex(commit_graft[i]->sha1);
213 count++;
214 if (use_pack_protocol)
215 packet_write(fd, "shallow %s", hex);
216 else {
93822c22
AW
217 if (write_in_full(fd, hex, 40) != 40)
218 break;
219 if (write_in_full(fd, "\n", 1) != 1)
220 break;
ed09aef0
JS
221 }
222 }
223 return count;
224}
225
f53514bc
JS
226int unregister_shallow(const unsigned char *sha1)
227{
228 int pos = commit_graft_pos(sha1);
229 if (pos < 0)
230 return -1;
231 if (pos + 1 < commit_graft_nr)
232 memcpy(commit_graft + pos, commit_graft + pos + 1,
233 sizeof(struct commit_graft *)
234 * (commit_graft_nr - pos - 1));
235 commit_graft_nr--;
236 return 0;
237}
238
bd2c39f5 239int parse_commit_buffer(struct commit *item, void *buffer, unsigned long size)
175785e5 240{
3b44f15a 241 char *tail = buffer;
f7cc77d7 242 char *bufptr = buffer;
175785e5 243 unsigned char parent[20];
6c88be16 244 struct commit_list **pptr;
5da5c8f4 245 struct commit_graft *graft;
bd2c39f5 246
175785e5
DB
247 if (item->object.parsed)
248 return 0;
249 item->object.parsed = 1;
3b44f15a 250 tail += size;
0a617799 251 if (tail <= bufptr + 46 || memcmp(bufptr, "tree ", 5) || bufptr[45] != '\n')
f7cc77d7 252 return error("bogus commit object %s", sha1_to_hex(item->object.sha1));
0a617799 253 if (get_sha1_hex(bufptr + 5, parent) < 0)
bd2afde8
JH
254 return error("bad tree pointer in commit %s",
255 sha1_to_hex(item->object.sha1));
175785e5 256 item->tree = lookup_tree(parent);
175785e5 257 bufptr += 46; /* "tree " + "hex sha1" + "\n" */
6c88be16 258 pptr = &item->parents;
5da5c8f4
JH
259
260 graft = lookup_commit_graft(item->object.sha1);
3b44f15a 261 while (bufptr + 48 < tail && !memcmp(bufptr, "parent ", 7)) {
f7cc77d7
LT
262 struct commit *new_parent;
263
3b44f15a
JH
264 if (tail <= bufptr + 48 ||
265 get_sha1_hex(bufptr + 7, parent) ||
266 bufptr[47] != '\n')
f7cc77d7 267 return error("bad parents in commit %s", sha1_to_hex(item->object.sha1));
5da5c8f4
JH
268 bufptr += 48;
269 if (graft)
270 continue;
f7cc77d7 271 new_parent = lookup_commit(parent);
39468def 272 if (new_parent)
6c88be16 273 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4
JH
274 }
275 if (graft) {
276 int i;
277 struct commit *new_parent;
278 for (i = 0; i < graft->nr_parent; i++) {
279 new_parent = lookup_commit(graft->parent[i]);
280 if (!new_parent)
281 continue;
282 pptr = &commit_list_insert(new_parent, pptr)->next;
5da5c8f4 283 }
175785e5 284 }
0a617799 285 item->date = parse_commit_date(bufptr, tail);
27dedf0c 286
175785e5
DB
287 return 0;
288}
289
bd2c39f5
NP
290int parse_commit(struct commit *item)
291{
21666f1a 292 enum object_type type;
bd2c39f5
NP
293 void *buffer;
294 unsigned long size;
295 int ret;
296
9786f68b
MK
297 if (!item)
298 return -1;
bd2c39f5
NP
299 if (item->object.parsed)
300 return 0;
21666f1a 301 buffer = read_sha1_file(item->object.sha1, &type, &size);
bd2c39f5
NP
302 if (!buffer)
303 return error("Could not read %s",
304 sha1_to_hex(item->object.sha1));
21666f1a 305 if (type != OBJ_COMMIT) {
bd2c39f5
NP
306 free(buffer);
307 return error("Object %s not a commit",
308 sha1_to_hex(item->object.sha1));
309 }
310 ret = parse_commit_buffer(item, buffer, size);
60ab26de 311 if (save_commit_buffer && !ret) {
3ff1fbbb
LT
312 item->buffer = buffer;
313 return 0;
314 }
bd2c39f5
NP
315 free(buffer);
316 return ret;
317}
318
ac5155ef 319struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)
dd97f850 320{
812666c8 321 struct commit_list *new_list = xmalloc(sizeof(struct commit_list));
dd97f850
DB
322 new_list->item = item;
323 new_list->next = *list_p;
324 *list_p = new_list;
ac5155ef 325 return new_list;
dd97f850
DB
326}
327
65319475
MV
328unsigned commit_list_count(const struct commit_list *l)
329{
330 unsigned c = 0;
331 for (; l; l = l->next )
332 c++;
333 return c;
334}
335
175785e5
DB
336void free_commit_list(struct commit_list *list)
337{
338 while (list) {
339 struct commit_list *temp = list;
340 list = temp->next;
341 free(temp);
342 }
343}
dd97f850 344
f755494c 345struct commit_list * insert_by_date(struct commit *item, struct commit_list **list)
dd97f850
DB
346{
347 struct commit_list **pp = list;
348 struct commit_list *p;
349 while ((p = *pp) != NULL) {
350 if (p->item->date < item->date) {
351 break;
352 }
353 pp = &p->next;
354 }
f755494c 355 return commit_list_insert(item, pp);
dd97f850
DB
356}
357
a6080a0a 358
dd97f850
DB
359void sort_by_date(struct commit_list **list)
360{
361 struct commit_list *ret = NULL;
362 while (*list) {
f755494c 363 insert_by_date((*list)->item, &ret);
dd97f850
DB
364 *list = (*list)->next;
365 }
366 *list = ret;
367}
368
58e28af6
DB
369struct commit *pop_most_recent_commit(struct commit_list **list,
370 unsigned int mark)
dd97f850
DB
371{
372 struct commit *ret = (*list)->item;
373 struct commit_list *parents = ret->parents;
374 struct commit_list *old = *list;
375
376 *list = (*list)->next;
377 free(old);
378
379 while (parents) {
4056c091 380 struct commit *commit = parents->item;
dec38c81 381 if (!parse_commit(commit) && !(commit->object.flags & mark)) {
58e28af6 382 commit->object.flags |= mark;
f755494c 383 insert_by_date(commit, list);
4056c091 384 }
dd97f850
DB
385 parents = parents->next;
386 }
387 return ret;
388}
e3bc7a3b 389
f8f9c73c
JH
390void clear_commit_marks(struct commit *commit, unsigned int mark)
391{
60fcc2e6
JS
392 while (commit) {
393 struct commit_list *parents;
f8f9c73c 394
60fcc2e6
JS
395 if (!(mark & commit->object.flags))
396 return;
58ecf5c1 397
60fcc2e6
JS
398 commit->object.flags &= ~mark;
399
400 parents = commit->parents;
401 if (!parents)
402 return;
403
404 while ((parents = parents->next))
405 clear_commit_marks(parents->item, mark);
406
407 commit = commit->parents->item;
f8f9c73c
JH
408 }
409}
410
a3437b8c
JS
411struct commit *pop_commit(struct commit_list **stack)
412{
413 struct commit_list *top = *stack;
414 struct commit *item = top ? top->item : NULL;
415
416 if (top) {
417 *stack = top->next;
418 free(top);
419 }
420 return item;
421}
422
ab580ace
JS
423/*
424 * Performs an in-place topological sort on the list supplied.
425 */
4c8725f1 426void sort_in_topological_order(struct commit_list ** list, int lifo)
6b6dcfc2 427{
23c17d4a
LT
428 struct commit_list *next, *orig = *list;
429 struct commit_list *work, **insert;
430 struct commit_list **pptr;
a6080a0a 431
23c17d4a 432 if (!orig)
7d6fb370 433 return;
23c17d4a
LT
434 *list = NULL;
435
436 /* Mark them and clear the indegree */
437 for (next = orig; next; next = next->next) {
438 struct commit *commit = next->item;
439 commit->object.flags |= TOPOSORT;
440 commit->indegree = 0;
ab580ace 441 }
23c17d4a 442
ab580ace 443 /* update the indegree */
23c17d4a 444 for (next = orig; next; next = next->next) {
ab580ace
JS
445 struct commit_list * parents = next->item->parents;
446 while (parents) {
23c17d4a 447 struct commit *parent = parents->item;
6b6dcfc2 448
23c17d4a
LT
449 if (parent->object.flags & TOPOSORT)
450 parent->indegree++;
451 parents = parents->next;
ab580ace 452 }
ab580ace 453 }
23c17d4a 454
a6080a0a 455 /*
674d1727
PH
456 * find the tips
457 *
458 * tips are nodes not reachable from any other node in the list
459 *
460 * the tips serve as a starting set for the work queue.
461 */
23c17d4a 462 work = NULL;
2ed02887 463 insert = &work;
23c17d4a
LT
464 for (next = orig; next; next = next->next) {
465 struct commit *commit = next->item;
ab580ace 466
23c17d4a
LT
467 if (!commit->indegree)
468 insert = &commit_list_insert(commit, insert)->next;
ab580ace 469 }
4c8725f1 470
ab580ace 471 /* process the list in topological order */
4c8725f1
JH
472 if (!lifo)
473 sort_by_date(&work);
23c17d4a
LT
474
475 pptr = list;
476 *list = NULL;
ab580ace 477 while (work) {
23c17d4a
LT
478 struct commit *commit;
479 struct commit_list *parents, *work_item;
ab580ace 480
23c17d4a
LT
481 work_item = work;
482 work = work_item->next;
483 work_item->next = NULL;
484
485 commit = work_item->item;
486 for (parents = commit->parents; parents ; parents = parents->next) {
487 struct commit *parent=parents->item;
488
489 if (!(parent->object.flags & TOPOSORT))
490 continue;
491
492 /*
493 * parents are only enqueued for emission
494 * when all their children have been emitted thereby
495 * guaranteeing topological order.
496 */
497 if (!--parent->indegree) {
498 if (!lifo)
499 insert_by_date(parent, &work);
500 else
501 commit_list_insert(parent, &work);
ab580ace 502 }
ab580ace
JS
503 }
504 /*
674d1727
PH
505 * work_item is a commit all of whose children
506 * have already been emitted. we can emit it now.
507 */
23c17d4a
LT
508 commit->object.flags &= ~TOPOSORT;
509 *pptr = work_item;
510 pptr = &work_item->next;
ab580ace 511 }
ab580ace 512}
7c6f8aaf 513
1295228d 514/* merge-base stuff */
7c6f8aaf 515
577ed5c2
JH
516/* bits #0..15 in revision.h */
517#define PARENT1 (1u<<16)
518#define PARENT2 (1u<<17)
519#define STALE (1u<<18)
520#define RESULT (1u<<19)
7c6f8aaf 521
1295228d
JH
522static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);
523
7c6f8aaf
JS
524static struct commit *interesting(struct commit_list *list)
525{
526 while (list) {
527 struct commit *commit = list->item;
528 list = list->next;
542ccefe 529 if (commit->object.flags & STALE)
7c6f8aaf
JS
530 continue;
531 return commit;
532 }
533 return NULL;
534}
535
6a938648 536static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)
7c6f8aaf
JS
537{
538 struct commit_list *list = NULL;
539 struct commit_list *result = NULL;
6a938648 540 int i;
7c6f8aaf 541
6a938648
JH
542 for (i = 0; i < n; i++) {
543 if (one == twos[i])
544 /*
545 * We do not mark this even with RESULT so we do not
546 * have to clean it up.
547 */
548 return commit_list_insert(one, &result);
549 }
7c6f8aaf 550
172947e6
MK
551 if (parse_commit(one))
552 return NULL;
6a938648
JH
553 for (i = 0; i < n; i++) {
554 if (parse_commit(twos[i]))
555 return NULL;
556 }
7c6f8aaf 557
f3249438 558 one->object.flags |= PARENT1;
f3249438 559 insert_by_date(one, &list);
6a938648
JH
560 for (i = 0; i < n; i++) {
561 twos[i]->object.flags |= PARENT2;
562 insert_by_date(twos[i], &list);
563 }
7c6f8aaf
JS
564
565 while (interesting(list)) {
f3249438 566 struct commit *commit;
7c6f8aaf 567 struct commit_list *parents;
f3249438
JH
568 struct commit_list *n;
569 int flags;
7c6f8aaf 570
f3249438
JH
571 commit = list->item;
572 n = list->next;
573 free(list);
574 list = n;
7c6f8aaf 575
f3249438
JH
576 flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);
577 if (flags == (PARENT1 | PARENT2)) {
578 if (!(commit->object.flags & RESULT)) {
579 commit->object.flags |= RESULT;
580 insert_by_date(commit, &result);
581 }
542ccefe
JH
582 /* Mark parents of a found merge stale */
583 flags |= STALE;
7c6f8aaf
JS
584 }
585 parents = commit->parents;
586 while (parents) {
587 struct commit *p = parents->item;
588 parents = parents->next;
589 if ((p->object.flags & flags) == flags)
590 continue;
172947e6
MK
591 if (parse_commit(p))
592 return NULL;
7c6f8aaf
JS
593 p->object.flags |= flags;
594 insert_by_date(p, &list);
595 }
596 }
597
f3249438 598 /* Clean up the result to remove stale ones */
1295228d 599 free_commit_list(list);
f3249438
JH
600 list = result; result = NULL;
601 while (list) {
602 struct commit_list *n = list->next;
603 if (!(list->item->object.flags & STALE))
604 insert_by_date(list->item, &result);
605 free(list);
606 list = n;
607 }
608 return result;
609}
7c6f8aaf 610
5240c9d7
MV
611struct commit_list *get_octopus_merge_bases(struct commit_list *in)
612{
613 struct commit_list *i, *j, *k, *ret = NULL;
614 struct commit_list **pptr = &ret;
615
616 for (i = in; i; i = i->next) {
617 if (!ret)
618 pptr = &commit_list_insert(i->item, pptr)->next;
619 else {
620 struct commit_list *new = NULL, *end = NULL;
621
622 for (j = ret; j; j = j->next) {
623 struct commit_list *bases;
624 bases = get_merge_bases(i->item, j->item, 1);
625 if (!new)
626 new = bases;
627 else
628 end->next = bases;
629 for (k = bases; k; k = k->next)
630 end = k;
631 }
632 ret = new;
633 }
634 }
635 return ret;
636}
637
6a938648
JH
638struct commit_list *get_merge_bases_many(struct commit *one,
639 int n,
640 struct commit **twos,
641 int cleanup)
f3249438 642{
f3249438
JH
643 struct commit_list *list;
644 struct commit **rslt;
645 struct commit_list *result;
646 int cnt, i, j;
647
6a938648
JH
648 result = merge_bases_many(one, n, twos);
649 for (i = 0; i < n; i++) {
650 if (one == twos[i])
651 return result;
652 }
f3249438
JH
653 if (!result || !result->next) {
654 if (cleanup) {
655 clear_commit_marks(one, all_flags);
6a938648
JH
656 for (i = 0; i < n; i++)
657 clear_commit_marks(twos[i], all_flags);
7c6f8aaf 658 }
f3249438 659 return result;
7c6f8aaf
JS
660 }
661
f3249438
JH
662 /* There are more than one */
663 cnt = 0;
664 list = result;
665 while (list) {
666 list = list->next;
667 cnt++;
668 }
669 rslt = xcalloc(cnt, sizeof(*rslt));
670 for (list = result, i = 0; list; list = list->next)
671 rslt[i++] = list->item;
672 free_commit_list(result);
673
674 clear_commit_marks(one, all_flags);
6a938648
JH
675 for (i = 0; i < n; i++)
676 clear_commit_marks(twos[i], all_flags);
f3249438
JH
677 for (i = 0; i < cnt - 1; i++) {
678 for (j = i+1; j < cnt; j++) {
679 if (!rslt[i] || !rslt[j])
680 continue;
6a938648 681 result = merge_bases_many(rslt[i], 1, &rslt[j]);
f3249438
JH
682 clear_commit_marks(rslt[i], all_flags);
683 clear_commit_marks(rslt[j], all_flags);
684 for (list = result; list; list = list->next) {
685 if (rslt[i] == list->item)
686 rslt[i] = NULL;
687 if (rslt[j] == list->item)
688 rslt[j] = NULL;
689 }
690 }
58ecf5c1 691 }
7c6f8aaf 692
f3249438
JH
693 /* Surviving ones in rslt[] are the independent results */
694 result = NULL;
695 for (i = 0; i < cnt; i++) {
696 if (rslt[i])
697 insert_by_date(rslt[i], &result);
698 }
699 free(rslt);
7c6f8aaf
JS
700 return result;
701}
2ecd2bbc 702
6a938648
JH
703struct commit_list *get_merge_bases(struct commit *one, struct commit *two,
704 int cleanup)
705{
706 return get_merge_bases_many(one, 1, &two, cleanup);
707}
708
03840fc3 709int in_merge_bases(struct commit *commit, struct commit **reference, int num)
2ecd2bbc
JH
710{
711 struct commit_list *bases, *b;
712 int ret = 0;
713
03840fc3
JH
714 if (num == 1)
715 bases = get_merge_bases(commit, *reference, 1);
716 else
717 die("not yet");
2ecd2bbc 718 for (b = bases; b; b = b->next) {
03840fc3 719 if (!hashcmp(commit->object.sha1, b->item->object.sha1)) {
2ecd2bbc
JH
720 ret = 1;
721 break;
722 }
723 }
724
725 free_commit_list(bases);
726 return ret;
727}
98cf9c3b
JH
728
729struct commit_list *reduce_heads(struct commit_list *heads)
730{
731 struct commit_list *p;
732 struct commit_list *result = NULL, **tail = &result;
733 struct commit **other;
734 size_t num_head, num_other;
735
736 if (!heads)
737 return NULL;
738
739 /* Avoid unnecessary reallocations */
740 for (p = heads, num_head = 0; p; p = p->next)
741 num_head++;
742 other = xcalloc(sizeof(*other), num_head);
743
744 /* For each commit, see if it can be reached by others */
745 for (p = heads; p; p = p->next) {
746 struct commit_list *q, *base;
747
711f6b29
JH
748 /* Do we already have this in the result? */
749 for (q = result; q; q = q->next)
750 if (p->item == q->item)
751 break;
752 if (q)
753 continue;
754
98cf9c3b
JH
755 num_other = 0;
756 for (q = heads; q; q = q->next) {
3d1dd472 757 if (p->item == q->item)
98cf9c3b
JH
758 continue;
759 other[num_other++] = q->item;
760 }
711f6b29 761 if (num_other)
98cf9c3b 762 base = get_merge_bases_many(p->item, num_other, other, 1);
711f6b29 763 else
98cf9c3b
JH
764 base = NULL;
765 /*
766 * If p->item does not have anything common with other
767 * commits, there won't be any merge base. If it is
768 * reachable from some of the others, p->item will be
769 * the merge base. If its history is connected with
770 * others, but p->item is not reachable by others, we
771 * will get something other than p->item back.
772 */
773 if (!base || (base->item != p->item))
774 tail = &(commit_list_insert(p->item, tail)->next);
775 free_commit_list(base);
776 }
777 free(other);
778 return result;
779}