From 9b632be30c72f25ac180fa2bf7286505c87e46d2 Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 18 May 2005 16:16:51 -0700 Subject: merge-base: use the new lookup_commit_reference() helper function This allows you to use tags for merge bases. diff --git a/merge-base.c b/merge-base.c index 2ea4497..6aa7f56 100644 --- a/merge-base.c +++ b/merge-base.c @@ -62,8 +62,8 @@ int main(int argc, char **argv) get_sha1(argv[2], rev2key)) { usage("merge-base "); } - rev1 = lookup_commit(rev1key); - rev2 = lookup_commit(rev2key); + rev1 = lookup_commit_reference(rev1key); + rev2 = lookup_commit_reference(rev2key); ret = common_ancestor(rev1, rev2); if (!ret) return 1; -- cgit v0.10.2-6-g49f6