Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.kernel.org/pub/scm/git/git.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
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 2c40881302..2ea44970d2 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 <commit-id> <commit-id>");
}
rev1 = lookup_commit(rev1key);