From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Wed, 18 May 2005 23:16:51 +0000 (-0700)
Subject: merge-base: use the new lookup_commit_reference() helper function
X-Git-Tag: v0.99~545
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=9b632be30c72f25ac180fa2bf7286505c87e46d2;p=git.git

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 2ea44970d..6aa7f5652 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 <commit-id> <commit-id>");
 	}
-	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;