diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-05-08 16:40:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-08 16:40:23 -0700 |
| commit | 45f75a0167b4a4693f2c6005bf7db231ca91ecc8 (patch) | |
| tree | d7cb273a493d3b37aad4a41284cd8e2fb68f80c4 /merge-base.c | |
| parent | fd60acaced6de16ebfb66959067e2b29f99a133e (diff) | |
| parent | 31fff305bcc6db3b8082eac7fc9e441b27964fea (diff) | |
| download | git-45f75a0167b4a4693f2c6005bf7db231ca91ecc8.tar.gz | |
Merge branch 'fix'
* fix:
Separate object name errors from usage errors
Documentation: {caret} fixes (git-rev-list.txt)
Fix "git diff --stat" with long filenames
Fix repo-config set-multivar error return path.
Diffstat (limited to 'merge-base.c')
| -rw-r--r-- | merge-base.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/merge-base.c b/merge-base.c index 07f5ab4d1c..f0dc06ef55 100644 --- a/merge-base.c +++ b/merge-base.c @@ -247,10 +247,12 @@ int main(int argc, char **argv) usage(merge_base_usage); argc--; argv++; } - if (argc != 3 || - get_sha1(argv[1], rev1key) || - get_sha1(argv[2], rev2key)) + if (argc != 3) usage(merge_base_usage); + if (get_sha1(argv[1], rev1key)) + die("Not a valid object name %s", argv[1]); + if (get_sha1(argv[2], rev2key)) + die("Not a valid object name %s", argv[2]); rev1 = lookup_commit_reference(rev1key); rev2 = lookup_commit_reference(rev2key); if (!rev1 || !rev2) |