1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-10-30 05:47:53 +01:00
git/merge-base.c
Linus Torvalds 4f7eb2e5a3 Fix merge-base from getting confused.
On Sat, 30 Jul 2005, Linus Torvalds wrote:
> 
> Yup, it's git-merge-base, and it is confused by the same thing that 
> confused git-rev-list.

Hmm.. Here's a tentative fix. I'm not really happy with it, and maybe
somebody else can come up with a better one. I think this one ends up
being quite a bit more expensive than the old one (it will look up _all_
common parents that have a child that isn't common, and then select the
newest one of the bunch), but I haven't really thought it through very
much.

Signed-off-by: Linus Torvalds <torvalds@osdl.org>
2005-07-30 22:58:21 -07:00

70 lines
1.5 KiB
C

#include <stdlib.h>
#include "cache.h"
#include "commit.h"
static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
{
struct commit_list *list = NULL;
struct commit_list *result = NULL;
if (rev1 == rev2)
return rev1;
parse_commit(rev1);
parse_commit(rev2);
rev1->object.flags |= 1;
rev2->object.flags |= 2;
insert_by_date(rev1, &list);
insert_by_date(rev2, &list);
while (list) {
struct commit *commit = list->item;
struct commit_list *tmp = list, *parents;
int flags = commit->object.flags & 3;
list = list->next;
free(tmp);
switch (flags) {
case 3:
insert_by_date(commit, &result);
continue;
case 0:
die("git-merge-base: commit without either parent?");
}
parents = commit->parents;
while (parents) {
struct commit *p = parents->item;
parents = parents->next;
if ((p->object.flags & flags) == flags)
continue;
parse_commit(p);
p->object.flags |= flags;
insert_by_date(p, &list);
}
}
if (!result)
return NULL;
return result->item;
}
int main(int argc, char **argv)
{
struct commit *rev1, *rev2, *ret;
unsigned char rev1key[20], rev2key[20];
if (argc != 3 ||
get_sha1(argv[1], rev1key) ||
get_sha1(argv[2], rev2key)) {
usage("git-merge-base <commit-id> <commit-id>");
}
rev1 = lookup_commit_reference(rev1key);
rev2 = lookup_commit_reference(rev2key);
if (!rev1 || !rev2)
return 1;
ret = common_ancestor(rev1, rev2);
if (!ret)
return 1;
printf("%s\n", sha1_to_hex(ret->object.sha1));
return 0;
}