#include "cache.h"

#include "tag.h"

#include "commit.h"

#include "pkt-line.h"

#include "utf8.h"

#include "diff.h"

#include "revision.h"

#include "notes.h"

#include "gpg-interface.h"

#include "mergesort.h"

#include "commit-slab.h"

#include "prio-queue.h"

#include "sha1-lookup.h"

static struct commit_extra_header *read_commit_extra_header_lines(const char *buf, size_t len, const char **);

int save_commit_buffer = 1;

const char *commit_type = "commit";

struct commit *lookup_commit_reference_gently(const unsigned char *sha1,

int quiet)

{

struct object *obj = deref_tag(parse_object(sha1), NULL, 0);

if (!obj)

return NULL;

return object_as_type(obj, OBJ_COMMIT, quiet);

}

struct commit *lookup_commit_reference(const unsigned char *sha1)

{

return lookup_commit_reference_gently(sha1, 0);

}

struct commit *lookup_commit_or_die(const unsigned char *sha1, const char *ref_name)

{

struct commit *c = lookup_commit_reference(sha1);

if (!c)

die(_("could not parse %s"), ref_name);

if (hashcmp(sha1, c->object.oid.hash)) {

warning(_("%s %s is not a commit!"),

ref_name, sha1_to_hex(sha1));

}

return c;

}

struct commit *lookup_commit(const unsigned char *sha1)

{

struct object *obj = lookup_object(sha1);

if (!obj)

return create_object(sha1, alloc_commit_node());

return object_as_type(obj, OBJ_COMMIT, 0);

}

struct commit *lookup_commit_reference_by_name(const char *name)

{

struct object_id oid;

struct commit *commit;

if (get_sha1_committish(name, oid.hash))

return NULL;

commit = lookup_commit_reference(oid.hash);

if (parse_commit(commit))

return NULL;

return commit;

}

static unsigned long parse_commit_date(const char *buf, const char *tail)

{

const char *dateptr;

if (buf + 6 >= tail)

return 0;

if (memcmp(buf, "author", 6))

return 0;

while (buf < tail && *buf++ != '\n')

/* nada */;

if (buf + 9 >= tail)

return 0;

if (memcmp(buf, "committer", 9))

return 0;

while (buf < tail && *buf++ != '>')

/* nada */;

if (buf >= tail)

return 0;

dateptr = buf;

while (buf < tail && *buf++ != '\n')

/* nada */;

if (buf >= tail)

return 0;

/* dateptr < buf && buf[-1] == '\n', so strtoul will stop at buf-1 */

return strtoul(dateptr, NULL, 10);

}

static struct commit_graft **commit_graft;

static int commit_graft_alloc, commit_graft_nr;

static const unsigned char *commit_graft_sha1_access(size_t index, void *table)

{

struct commit_graft **commit_graft_table = table;

return commit_graft_table[index]->oid.hash;

}

static int commit_graft_pos(const unsigned char *sha1)

{

return sha1_pos(sha1, commit_graft, commit_graft_nr,

commit_graft_sha1_access);

}

int register_commit_graft(struct commit_graft *graft, int ignore_dups)

{

int pos = commit_graft_pos(graft->oid.hash);

if (0 <= pos) {

if (ignore_dups)

free(graft);

else {

free(commit_graft[pos]);

commit_graft[pos] = graft;

}

return 1;

}

pos = -pos - 1;

ALLOC_GROW(commit_graft, commit_graft_nr + 1, commit_graft_alloc);

commit_graft_nr++;

if (pos < commit_graft_nr)

memmove(commit_graft + pos + 1,

commit_graft + pos,

(commit_graft_nr - pos - 1) *

sizeof(*commit_graft));

commit_graft[pos] = graft;

return 0;

}

struct commit_graft *read_graft_line(char *buf, int len)

{

/* The format is just "Commit Parent1 Parent2 ...\n" */

int i;

struct commit_graft *graft = NULL;

const int entry_size = GIT_SHA1_HEXSZ + 1;

while (len && isspace(buf[len-1]))

buf[--len] = '\0';

if (buf[0] == '#' || buf[0] == '\0')

return NULL;

if ((len + 1) % entry_size)

goto bad_graft_data;

i = (len + 1) / entry_size - 1;

graft = xmalloc(st_add(sizeof(*graft), st_mult(GIT_SHA1_RAWSZ, i)));

graft->nr_parent = i;

if (get_oid_hex(buf, &graft->oid))

goto bad_graft_data;

for (i = GIT_SHA1_HEXSZ; i < len; i += entry_size) {

if (buf[i] != ' ')

goto bad_graft_data;

if (get_sha1_hex(buf + i + 1, graft->parent[i/entry_size].hash))

goto bad_graft_data;

}

return graft;

bad_graft_data:

error("bad graft data: %s", buf);

free(graft);

return NULL;

}

static int read_graft_file(const char *graft_file)

{

FILE *fp = fopen(graft_file, "r");

struct strbuf buf = STRBUF_INIT;

if (!fp)

return -1;

while (!strbuf_getwholeline(&buf, fp, '\n')) {

/* The format is just "Commit Parent1 Parent2 ...\n" */

struct commit_graft *graft = read_graft_line(buf.buf, buf.len);

if (!graft)

continue;

if (register_commit_graft(graft, 1))

error("duplicate graft data: %s", buf.buf);

}

fclose(fp);

strbuf_release(&buf);

return 0;

}

static void prepare_commit_graft(void)

{

static int commit_graft_prepared;

char *graft_file;

if (commit_graft_prepared)

return;

graft_file = get_graft_file();

read_graft_file(graft_file);

/* make sure shallows are read */

is_repository_shallow();

commit_graft_prepared = 1;

}

struct commit_graft *lookup_commit_graft(const unsigned char *sha1)

{

int pos;

prepare_commit_graft();

pos = commit_graft_pos(sha1);

if (pos < 0)

return NULL;

return commit_graft[pos];

}

int for_each_commit_graft(each_commit_graft_fn fn, void *cb_data)

{

int i, ret;

for (i = ret = 0; i < commit_graft_nr && !ret; i++)

ret = fn(commit_graft[i], cb_data);

return ret;

}

int unregister_shallow(const unsigned char *sha1)

{

int pos = commit_graft_pos(sha1);

if (pos < 0)

return -1;

if (pos + 1 < commit_graft_nr)

memmove(commit_graft + pos, commit_graft + pos + 1,

sizeof(struct commit_graft *)

* (commit_graft_nr - pos - 1));

commit_graft_nr--;

return 0;

}

struct commit_buffer {

void *buffer;

unsigned long size;

};

define_commit_slab(buffer_slab, struct commit_buffer);

static struct buffer_slab buffer_slab = COMMIT_SLAB_INIT(1, buffer_slab);

void set_commit_buffer(struct commit *commit, void *buffer, unsigned long size)

{

struct commit_buffer *v = buffer_slab_at(&buffer_slab, commit);

v->buffer = buffer;

v->size = size;

}

const void *get_cached_commit_buffer(const struct commit *commit, unsigned long *sizep)

{

struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);

if (!v) {

if (sizep)

*sizep = 0;

return NULL;

}

if (sizep)

*sizep = v->size;

return v->buffer;

}

const void *get_commit_buffer(const struct commit *commit, unsigned long *sizep)

{

const void *ret = get_cached_commit_buffer(commit, sizep);

if (!ret) {

enum object_type type;

unsigned long size;

ret = read_sha1_file(commit->object.oid.hash, &type, &size);

if (!ret)

die("cannot read commit object %s",

oid_to_hex(&commit->object.oid));

if (type != OBJ_COMMIT)

die("expected commit for %s, got %s",

oid_to_hex(&commit->object.oid), typename(type));

if (sizep)

*sizep = size;

}

return ret;

}

void unuse_commit_buffer(const struct commit *commit, const void *buffer)

{

struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);

if (!(v && v->buffer == buffer))

free((void *)buffer);

}

void free_commit_buffer(struct commit *commit)

{

struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);

if (v) {

free(v->buffer);

v->buffer = NULL;

v->size = 0;

}

}

const void *detach_commit_buffer(struct commit *commit, unsigned long *sizep)

{

struct commit_buffer *v = buffer_slab_peek(&buffer_slab, commit);

void *ret;

if (!v) {

if (sizep)

*sizep = 0;

return NULL;

}

ret = v->buffer;

if (sizep)

*sizep = v->size;

v->buffer = NULL;

v->size = 0;

return ret;

}

int parse_commit_buffer(struct commit *item, const void *buffer, unsigned long size)

{

const char *tail = buffer;

const char *bufptr = buffer;

struct object_id parent;

struct commit_list **pptr;

struct commit_graft *graft;

const int tree_entry_len = GIT_SHA1_HEXSZ + 5;

const int parent_entry_len = GIT_SHA1_HEXSZ + 7;

if (item->object.parsed)

return 0;

item->object.parsed = 1;

tail += size;

if (tail <= bufptr + tree_entry_len + 1 || memcmp(bufptr, "tree ", 5) ||

bufptr[tree_entry_len] != '\n')

return error("bogus commit object %s", oid_to_hex(&item->object.oid));

if (get_sha1_hex(bufptr + 5, parent.hash) < 0)

return error("bad tree pointer in commit %s",

oid_to_hex(&item->object.oid));

item->tree = lookup_tree(parent.hash);

bufptr += tree_entry_len + 1; /* "tree " + "hex sha1" + "\n" */

pptr = &item->parents;

graft = lookup_commit_graft(item->object.oid.hash);

while (bufptr + parent_entry_len < tail && !memcmp(bufptr, "parent ", 7)) {

struct commit *new_parent;

if (tail <= bufptr + parent_entry_len + 1 ||

get_sha1_hex(bufptr + 7, parent.hash) ||

bufptr[parent_entry_len] != '\n')

return error("bad parents in commit %s", oid_to_hex(&item->object.oid));

bufptr += parent_entry_len + 1;

/*

* The clone is shallow if nr_parent < 0, and we must

* not traverse its real parents even when we unhide them.

*/

if (graft && (graft->nr_parent < 0 || grafts_replace_parents))

continue;

new_parent = lookup_commit(parent.hash);

if (new_parent)

pptr = &commit_list_insert(new_parent, pptr)->next;

}

if (graft) {

int i;

struct commit *new_parent;

for (i = 0; i < graft->nr_parent; i++) {

new_parent = lookup_commit(graft->parent[i].hash);

if (!new_parent)

continue;

pptr = &commit_list_insert(new_parent, pptr)->next;

}

}

item->date = parse_commit_date(bufptr, tail);

return 0;

}

int parse_commit_gently(struct commit *item, int quiet_on_missing)

{

enum object_type type;

void *buffer;

unsigned long size;

int ret;

if (!item)

return -1;

if (item->object.parsed)

return 0;

buffer = read_sha1_file(item->object.oid.hash, &type, &size);

if (!buffer)

return quiet_on_missing ? -1 :

error("Could not read %s",

oid_to_hex(&item->object.oid));

if (type != OBJ_COMMIT) {

free(buffer);

return error("Object %s not a commit",

oid_to_hex(&item->object.oid));

}

ret = parse_commit_buffer(item, buffer, size);

if (save_commit_buffer && !ret) {

set_commit_buffer(item, buffer, size);

return 0;

}

free(buffer);

return ret;

}

void parse_commit_or_die(struct commit *item)

{

if (parse_commit(item))

die("unable to parse commit %s",

item ? oid_to_hex(&item->object.oid) : "(null)");

}

int find_commit_subject(const char *commit_buffer, const char **subject)

{

const char *eol;

const char *p = commit_buffer;

while (*p && (*p != '\n' || p[1] != '\n'))

p++;

if (*p) {

p = skip_blank_lines(p + 2);

for (eol = p; *eol && *eol != '\n'; eol++)

; /* do nothing */

} else

eol = p;

*subject = p;

return eol - p;

}

struct commit_list *commit_list_insert(struct commit *item, struct commit_list **list_p)

{

struct commit_list *new_list = xmalloc(sizeof(struct commit_list));

new_list->item = item;

new_list->next = *list_p;

*list_p = new_list;

return new_list;

}

unsigned commit_list_count(const struct commit_list *l)

{

unsigned c = 0;

for (; l; l = l->next )

c++;

return c;

}

struct commit_list *copy_commit_list(struct commit_list *list)

{

struct commit_list *head = NULL;

struct commit_list **pp = &head;

while (list) {

pp = commit_list_append(list->item, pp);

list = list->next;

}

return head;

}

void free_commit_list(struct commit_list *list)

{

while (list)

pop_commit(&list);

}

struct commit_list * commit_list_insert_by_date(struct commit *item, struct commit_list **list)

{

struct commit_list **pp = list;

struct commit_list *p;

while ((p = *pp) != NULL) {

if (p->item->date < item->date) {

break;

}

pp = &p->next;

}

return commit_list_insert(item, pp);

}

static int commit_list_compare_by_date(const void *a, const void *b)

{

unsigned long a_date = ((const struct commit_list *)a)->item->date;

unsigned long b_date = ((const struct commit_list *)b)->item->date;

if (a_date < b_date)

return 1;

if (a_date > b_date)

return -1;

return 0;

}

static void *commit_list_get_next(const void *a)

{

return ((const struct commit_list *)a)->next;

}

static void commit_list_set_next(void *a, void *next)

{

((struct commit_list *)a)->next = next;

}

void commit_list_sort_by_date(struct commit_list **list)

{

*list = llist_mergesort(*list, commit_list_get_next, commit_list_set_next,

commit_list_compare_by_date);

}

struct commit *pop_most_recent_commit(struct commit_list **list,

unsigned int mark)

{

struct commit *ret = pop_commit(list);

struct commit_list *parents = ret->parents;

while (parents) {

struct commit *commit = parents->item;

if (!parse_commit(commit) && !(commit->object.flags & mark)) {

commit->object.flags |= mark;

commit_list_insert_by_date(commit, list);

}

parents = parents->next;

}

return ret;

}

static void clear_commit_marks_1(struct commit_list **plist,

struct commit *commit, unsigned int mark)

{

while (commit) {

struct commit_list *parents;

if (!(mark & commit->object.flags))

return;

commit->object.flags &= ~mark;

parents = commit->parents;

if (!parents)

return;

while ((parents = parents->next))

commit_list_insert(parents->item, plist);

commit = commit->parents->item;

}

}

void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark)

{

struct commit_list *list = NULL;

while (nr--) {

commit_list_insert(*commit, &list);

commit++;

}

while (list)

clear_commit_marks_1(&list, pop_commit(&list), mark);

}

void clear_commit_marks(struct commit *commit, unsigned int mark)

{

clear_commit_marks_many(1, &commit, mark);

}

void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark)

{

struct object *object;

struct commit *commit;

unsigned int i;

for (i = 0; i < a->nr; i++) {

object = a->objects[i].item;

commit = lookup_commit_reference_gently(object->oid.hash, 1);

if (commit)

clear_commit_marks(commit, mark);

}

}

struct commit *pop_commit(struct commit_list **stack)

{

struct commit_list *top = *stack;

struct commit *item = top ? top->item : NULL;

if (top) {

*stack = top->next;

free(top);

}

return item;

}

/*

* Topological sort support

*/

/* count number of children that have not been emitted */

define_commit_slab(indegree_slab, int);

/* record author-date for each commit object */

define_commit_slab(author_date_slab, unsigned long);

static void record_author_date(struct author_date_slab *author_date,

struct commit *commit)

{

const char *buffer = get_commit_buffer(commit, NULL);

struct ident_split ident;

const char *ident_line;

size_t ident_len;

char *date_end;

unsigned long date;

ident_line = find_commit_header(buffer, "author", &ident_len);

if (!ident_line)

goto fail_exit; /* no author line */

if (split_ident_line(&ident, ident_line, ident_len) ||

!ident.date_begin || !ident.date_end)

goto fail_exit; /* malformed "author" line */

date = strtoul(ident.date_begin, &date_end, 10);

if (date_end != ident.date_end)

goto fail_exit; /* malformed date */

*(author_date_slab_at(author_date, commit)) = date;

fail_exit:

unuse_commit_buffer(commit, buffer);

}

static int compare_commits_by_author_date(const void *a_, const void *b_,

void *cb_data)

{

const struct commit *a = a_, *b = b_;

struct author_date_slab *author_date = cb_data;

unsigned long a_date = *(author_date_slab_at(author_date, a));

unsigned long b_date = *(author_date_slab_at(author_date, b));

/* newer commits with larger date first */

if (a_date < b_date)

return 1;

else if (a_date > b_date)

return -1;

return 0;

}

int compare_commits_by_commit_date(const void *a_, const void *b_, void *unused)

{

const struct commit *a = a_, *b = b_;

/* newer commits with larger date first */

if (a->date < b->date)

return 1;

else if (a->date > b->date)

return -1;

return 0;

}

/*

* Performs an in-place topological sort on the list supplied.

*/

void sort_in_topological_order(struct commit_list **list, enum rev_sort_order sort_order)

{

struct commit_list *next, *orig = *list;

struct commit_list **pptr;

struct indegree_slab indegree;

struct prio_queue queue;

struct commit *commit;

struct author_date_slab author_date;

if (!orig)

return;

*list = NULL;

init_indegree_slab(&indegree);

memset(&queue, '\0', sizeof(queue));

switch (sort_order) {

default: /* REV_SORT_IN_GRAPH_ORDER */

queue.compare = NULL;

break;

case REV_SORT_BY_COMMIT_DATE:

queue.compare = compare_commits_by_commit_date;

break;

case REV_SORT_BY_AUTHOR_DATE:

init_author_date_slab(&author_date);

queue.compare = compare_commits_by_author_date;

queue.cb_data = &author_date;

break;

}

/* Mark them and clear the indegree */

for (next = orig; next; next = next->next) {

struct commit *commit = next->item;

*(indegree_slab_at(&indegree, commit)) = 1;

/* also record the author dates, if needed */

if (sort_order == REV_SORT_BY_AUTHOR_DATE)

record_author_date(&author_date, commit);

}

/* update the indegree */

for (next = orig; next; next = next->next) {

struct commit_list *parents = next->item->parents;

while (parents) {

struct commit *parent = parents->item;

int *pi = indegree_slab_at(&indegree, parent);

if (*pi)

(*pi)++;

parents = parents->next;

}

}

/*

* find the tips

*

* tips are nodes not reachable from any other node in the list

*

* the tips serve as a starting set for the work queue.

*/

for (next = orig; next; next = next->next) {

struct commit *commit = next->item;

if (*(indegree_slab_at(&indegree, commit)) == 1)

prio_queue_put(&queue, commit);

}

/*

* This is unfortunate; the initial tips need to be shown

* in the order given from the revision traversal machinery.

*/

if (sort_order == REV_SORT_IN_GRAPH_ORDER)

prio_queue_reverse(&queue);

/* We no longer need the commit list */

free_commit_list(orig);

pptr = list;

*list = NULL;

while ((commit = prio_queue_get(&queue)) != NULL) {

struct commit_list *parents;

for (parents = commit->parents; parents ; parents = parents->next) {

struct commit *parent = parents->item;

int *pi = indegree_slab_at(&indegree, parent);

if (!*pi)

continue;

/*

* parents are only enqueued for emission

* when all their children have been emitted thereby

* guaranteeing topological order.

*/

if (--(*pi) == 1)

prio_queue_put(&queue, parent);

}

/*

* all children of commit have already been

* emitted. we can emit it now.

*/

*(indegree_slab_at(&indegree, commit)) = 0;

pptr = &commit_list_insert(commit, pptr)->next;

}

clear_indegree_slab(&indegree);

clear_prio_queue(&queue);

if (sort_order == REV_SORT_BY_AUTHOR_DATE)

clear_author_date_slab(&author_date);

}

/* merge-base stuff */

/* Remember to update object flag allocation in object.h */

#define PARENT1 (1u<<16)

#define PARENT2 (1u<<17)

#define STALE (1u<<18)

#define RESULT (1u<<19)

static const unsigned all_flags = (PARENT1 | PARENT2 | STALE | RESULT);

static int queue_has_nonstale(struct prio_queue *queue)

{

int i;

for (i = 0; i < queue->nr; i++) {

struct commit *commit = queue->array[i].data;

if (!(commit->object.flags & STALE))

return 1;

}

return 0;

}

/* all input commits in one and twos[] must have been parsed! */

static struct commit_list *paint_down_to_common(struct commit *one, int n, struct commit **twos)

{

struct prio_queue queue = { compare_commits_by_commit_date };

struct commit_list *result = NULL;

int i;

one->object.flags |= PARENT1;

if (!n) {

commit_list_append(one, &result);

return result;

}

prio_queue_put(&queue, one);

for (i = 0; i < n; i++) {

twos[i]->object.flags |= PARENT2;

prio_queue_put(&queue, twos[i]);

}

while (queue_has_nonstale(&queue)) {

struct commit *commit = prio_queue_get(&queue);

struct commit_list *parents;

int flags;

flags = commit->object.flags & (PARENT1 | PARENT2 | STALE);

if (flags == (PARENT1 | PARENT2)) {

if (!(commit->object.flags & RESULT)) {

commit->object.flags |= RESULT;

commit_list_insert_by_date(commit, &result);

}

/* Mark parents of a found merge stale */

flags |= STALE;

}

parents = commit->parents;

while (parents) {

struct commit *p = parents->item;

parents = parents->next;

if ((p->object.flags & flags) == flags)

continue;

if (parse_commit(p))

return NULL;

p->object.flags |= flags;

prio_queue_put(&queue, p);

}

}

clear_prio_queue(&queue);

return result;

}

static struct commit_list *merge_bases_many(struct commit *one, int n, struct commit **twos)

{

struct commit_list *list = NULL;

struct commit_list *result = NULL;

int i;

for (i = 0; i < n; i++) {

if (one == twos[i])

/*

* We do not mark this even with RESULT so we do not

* have to clean it up.

*/

return commit_list_insert(one, &result);

}

if (parse_commit(one))

return NULL;

for (i = 0; i < n; i++) {

if (parse_commit(twos[i]))

return NULL;

}

list = paint_down_to_common(one, n, twos);

while (list) {

struct commit *commit = pop_commit(&list);

if (!(commit->object.flags & STALE))

commit_list_insert_by_date(commit, &result);

}

return result;

}

struct commit_list *get_octopus_merge_bases(struct commit_list *in)

{

struct commit_list *i, *j, *k, *ret = NULL;

if (!in)

return ret;

commit_list_insert(in->item, &ret);

for (i = in->next; i; i = i->next) {

struct commit_list *new = NULL, *end = NULL;

for (j = ret; j; j = j->next) {

struct commit_list *bases;

bases = get_merge_bases(i->item, j->item);

if (!new)

new = bases;

else

end->next = bases;

for (k = bases; k; k = k->next)

end = k;

}

ret = new;

}

return ret;

}

static int remove_redundant(struct commit **array, int cnt)

{

/*

* Some commit in the array may be an ancestor of

* another commit. Move such commit to the end of

* the array, and return the number of commits that

* are independent from each other.

*/

struct commit **work;

unsigned char *redundant;

int *filled_index;

int i, j, filled;

work = xcalloc(cnt, sizeof(*work));

redundant = xcalloc(cnt, 1);

ALLOC_ARRAY(filled_index, cnt - 1);

for (i = 0; i < cnt; i++)

parse_commit(array[i]);

for (i = 0; i < cnt; i++) {

struct commit_list *common;

if (redundant[i])

continue;

for (j = filled = 0; j < cnt; j++) {

if (i == j || redundant[j])

continue;

filled_index[filled] = j;

work[filled++] = array[j];

}

common = paint_down_to_common(array[i], filled, work);

if (array[i]->object.flags & PARENT2)

redundant[i] = 1;

for (j = 0; j < filled; j++)

if (work[j]->object.flags & PARENT1)

redundant[filled_index[j]] = 1;

clear_commit_marks(array[i], all_flags);

for (j = 0; j < filled; j++)

clear_commit_marks(work[j], all_flags);

free_commit_list(common);

}

/* Now collect the result */

COPY_ARRAY(work, array, cnt);

for (i = filled = 0; i < cnt; i++)

if (!redundant[i])

array[filled++] = work[i];

for (j = filled, i = 0; i < cnt; i++)

if (redundant[i])

array[j++] = work[i];

free(work);

free(redundant);

free(filled_index);

return filled;

}

static struct commit_list *get_merge_bases_many_0(struct commit *one,

int n,

struct commit **twos,

int cleanup)

{

struct commit_list *list;

struct commit **rslt;

struct commit_list *result;

int cnt, i;

result = merge_bases_many(one, n, twos);

for (i = 0; i < n; i++) {

if (one == twos[i])

return result;

}

if (!result || !result->next) {

if (cleanup) {

clear_commit_marks(one, all_flags);

clear_commit_marks_many(n, twos, all_flags);

}

return result;

}

/* There are more than one */

cnt = commit_list_count(result);

rslt = xcalloc(cnt, sizeof(*rslt));

for (list = result, i = 0; list; list = list->next)

rslt[i++] = list->item;

free_commit_list(result);

clear_commit_marks(one, all_flags);

clear_commit_marks_many(n, twos, all_flags);

cnt = remove_redundant(rslt, cnt);

result = NULL;

for (i = 0; i < cnt; i++)

commit_list_insert_by_date(rslt[i], &result);

free(rslt);

return result;

}

struct commit_list *get_merge_bases_many(struct commit *one,

int n,

struct commit **twos)

{

return get_merge_bases_many_0(one, n, twos, 1);

}

struct commit_list *get_merge_bases_many_dirty(struct commit *one,

int n,

struct commit **twos)

{

return get_merge_bases_many_0(one, n, twos, 0);

}