[PATCH 2/3] Rename git-diff-tree-helper to git-diff-helper.

diff --git a/merge-base.c b/merge-base.c
index 2c40881302e586366f03ae6ac6e7c0035847e2f0..2ea44970d20500740db78b1cf0b9854c29e27553 100644 (file)
--- 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 <commit-id> <commit-id>");
        }
        rev1 = lookup_commit(rev1key);