summaryrefslogtreecommitdiff
path: root/merge-base.c
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 23:16:51 (GMT)
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-05-18 23:16:51 (GMT)
commit9b632be30c72f25ac180fa2bf7286505c87e46d2 (patch)
tree9adfcec0fcbf1828127b46991ffb7f6c76586b73 /merge-base.c
parent961784ee422c22075e131292b2235782e378c612 (diff)
downloadgit-9b632be30c72f25ac180fa2bf7286505c87e46d2.zip
git-9b632be30c72f25ac180fa2bf7286505c87e46d2.tar.gz
git-9b632be30c72f25ac180fa2bf7286505c87e46d2.tar.bz2
merge-base: use the new lookup_commit_reference() helper function
This allows you to use tags for merge bases.
Diffstat (limited to 'merge-base.c')
-rw-r--r--merge-base.c4
1 files changed, 2 insertions, 2 deletions
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 <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;