Skip to content

Commit

Permalink
merge-base: use the new lookup_commit_reference() helper function
Browse files Browse the repository at this point in the history
This allows you to use tags for merge bases.
  • Loading branch information
Linus Torvalds committed May 18, 2005
1 parent 961784e commit 9b632be
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions merge-base.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit 9b632be

Please sign in to comment.