diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-24 22:26:57 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-24 22:26:57 -0700 |
| commit | 36932eab772dc621e79d615fda425ecf87e6d74e (patch) | |
| tree | e7dd08e6f3c231a40df41712bae42ec3c4d83b21 /rev-parse.c | |
| parent | be02b3c53ea8307fdfdb074562ad0b5963761718 (diff) | |
| parent | 1ab661ddb7eb564c1c3cb97a512257860a651459 (diff) | |
| download | git-36932eab772dc621e79d615fda425ecf87e6d74e.tar.xz | |
Merge branch 'fix'
* fix:
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
Diffstat (limited to 'rev-parse.c')
| -rw-r--r-- | rev-parse.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/rev-parse.c b/rev-parse.c index e956cd5ed5..7f66ae2db8 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -160,6 +160,14 @@ static int show_file(const char *arg) return 0; } +static void die_badfile(const char *arg) +{ + if (errno != ENOENT) + die("'%s': %s", arg, strerror(errno)); + die("'%s' is ambiguous - revision name or file/directory name?\n" + "Please put '--' before the list of filenames.", arg); +} + int main(int argc, char **argv) { int i, as_is = 0, verify = 0; @@ -176,7 +184,7 @@ int main(int argc, char **argv) if (as_is) { if (show_file(arg) && as_is < 2) if (lstat(arg, &st) < 0) - die("'%s': %s", arg, strerror(errno)); + die_badfile(arg); continue; } if (!strcmp(arg,"-n")) { @@ -343,7 +351,7 @@ int main(int argc, char **argv) if (verify) die("Needed a single revision"); if (lstat(arg, &st) < 0) - die("'%s': %s", arg, strerror(errno)); + die_badfile(arg); } show_default(); if (verify && revs_count != 1) |