From 3c249c950649a37f2871a8b193f01a0640a20aef Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Sun, 1 May 2005 16:36:56 -0700 Subject: Add "get_sha1()" helper function. This allows the programs to use various simplified versions of the SHA1 names, eg just say "HEAD" for the SHA1 pointed to by the .git/HEAD file etc. For example, this commit has been done with git-commit-tree $(git-write-tree) -p HEAD instead of the traditional "$(cat .git/HEAD)" syntax. --- merge-base.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge-base.c') 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 "); } rev1 = lookup_commit(rev1key); -- cgit v1.2.1