diff options
| author |  Junio C Hamano <junkio@cox.net> | 2006-05-08 16:43:23 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-05-08 16:43:23 -0700 |
| commit | bd8e265d67d93e83ee48fed565627522c1553654 (patch) | |
| tree | ae1e7b666f0f6698dda7d24e10064768edbe5299 /convert-objects.c | |
| parent | Merge branch 'jc/bindiff' into next (diff) | |
| parent | Teach git-clean optional <paths>... parameters. (diff) | |
| download | tgif-bd8e265d67d93e83ee48fed565627522c1553654.tar.xz | |
Merge branch 'jc/clean' into next
* jc/clean:
Teach git-clean optional <paths>... parameters.
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 'convert-objects.c')
| -rw-r--r-- | convert-objects.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/convert-objects.c b/convert-objects.c index 12aacef5a9..a67d6b479e 100644 --- a/convert-objects.c +++ b/convert-objects.c @@ -321,8 +321,10 @@ int main(int argc, char **argv) setup_git_directory(); - if (argc != 2 || get_sha1(argv[1], sha1)) + if (argc != 2) usage("git-convert-objects <sha1>"); + if (get_sha1(argv[1], sha1)) + die("Not a valid object name %s", argv[1]); entry = convert_entry(sha1); printf("new sha1: %s\n", sha1_to_hex(entry->new_sha1)); |