projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
t/Makefile: OPTS -> GIT_TEST_OPTS
[git.git]
/
merge-base.c
diff --git
a/merge-base.c
b/merge-base.c
index
2c40881
..
2ea4497
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 ||
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);
usage("merge-base <commit-id> <commit-id>");
}
rev1 = lookup_commit(rev1key);