X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=merge-base.c;h=2ea44970d20500740db78b1cf0b9854c29e27553;hb=fa9e9c7bc4d6437537a78517f7f6909340e25ad9;hp=2c40881302e586366f03ae6ac6e7c0035847e2f0;hpb=58e28af6a4d4d4faa1fa628e91c0b33c2b87aade;p=git.git diff --git a/merge-base.c b/merge-base.c index 2c4088130..2ea44970d 100644 --- a/merge-base.c +++ b/merge-base.c @@ -58,8 +58,8 @@ 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)) { + get_sha1(argv[1], rev1key) || + get_sha1(argv[2], rev2key)) { usage("merge-base "); } rev1 = lookup_commit(rev1key);