X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=merge-base.c;h=12ebb95fba51ee9bba9767b25c999bd3de9ebd94;hb=ec73962d8e17e89ac0c4b21f07cefe16594e07a2;hp=2c40881302e586366f03ae6ac6e7c0035847e2f0;hpb=58e28af6a4d4d4faa1fa628e91c0b33c2b87aade;p=git.git

diff --git a/merge-base.c b/merge-base.c
index 2c408813..12ebb95f 100644
--- a/merge-base.c
+++ b/merge-base.c
@@ -15,7 +15,7 @@ static struct commit *process_list(struct commit_list **list_p, int this_mark,
 	return NULL;
 }
 
-struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
+static struct commit *common_ancestor(struct commit *rev1, struct commit *rev2)
 {
 	struct commit_list *rev1list = NULL;
 	struct commit_list *rev2list = NULL;
@@ -58,12 +58,12 @@ int main(int argc, char **argv)
 	unsigned char rev1key[20], rev2key[20];
 
 	if (argc != 3 ||
-	    get_sha1_hex(argv[1], rev1key) ||
-	    get_sha1_hex(argv[2], rev2key)) {
-		usage("merge-base <commit-id> <commit-id>");
+	    get_sha1(argv[1], rev1key) ||
+	    get_sha1(argv[2], rev2key)) {
+		usage("git-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;