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 /describe.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 'describe.c')
| -rw-r--r-- | describe.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/describe.c b/describe.c index ff65742615..8a9cd5d52c 100644 --- a/describe.c +++ b/describe.c @@ -105,11 +105,11 @@ static void describe(char *arg, int last_one) static int initialized = 0; struct commit_name *n; - if (get_sha1(arg, sha1) < 0) - usage(describe_usage); + if (get_sha1(arg, sha1)) + die("Not a valid object name %s", arg); cmit = lookup_commit_reference(sha1); if (!cmit) - usage(describe_usage); + die("%s is not a valid '%s' object", arg, commit_type); if (!initialized) { initialized = 1; |