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 2ea44970d20500740db78b1cf0b9854c29e27553..6aa7f56526132dc0294717a3d3066ff568c33c38 100644 (file)
--- 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>");
        }
            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;
        ret = common_ancestor(rev1, rev2);
        if (!ret)
                return 1;