diff options
| author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 16:36:56 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-05-01 16:36:56 -0700 |
| commit | 3c249c950649a37f2871a8b193f01a0640a20aef (patch) | |
| tree | 8ce5c715973ddb7ed553be593c090de979c4a5ce /merge-base.c | |
| parent | 68849b544258cafdf42f3ebe9772ee7a346f7147 (diff) | |
| download | git-3c249c950649a37f2871a8b193f01a0640a20aef.tar.gz | |
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.
Diffstat (limited to 'merge-base.c')
| -rw-r--r-- | merge-base.c | 4 |
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); |