diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-26 03:29:09 -0700 |
| commit | b8ed7f0f40743dae6111c8950ba55051933298ca (patch) | |
| tree | ff4ebce0cdaf2c9c493eb38fd22f8e9d8d705bc0 /rev-parse.c | |
| parent | 0f8820528e4c2e4b3e1306cfe79998e7124c8d49 (diff) | |
| parent | 3496277a561307c3d31d2085347af8eb4c667c36 (diff) | |
| download | git-b8ed7f0f40743dae6111c8950ba55051933298ca.tar.gz | |
Merge branch 'master' into jc/cache-tree
* master:
commit-tree: allow generic object name for the tree as well.
Makefile: remove and create xdiff library from scratch.
t0000-basic: Add ls-tree recursive test back.
Libified diff-index: backward compatibility fix.
Libify diff-index.
Libify diff-files.
Makefile: remove and create libgit.a from scratch.
Document the configuration file
Document git-var -l listing also configuration variables
rev-parse: better error message for ambiguous arguments
make update-index --chmod work with multiple files and --stdin
socksetup: don't return on set_reuse_addr() error
Fix "git show --stat"
git-update-index --unresolve
Add git-unresolve <paths>...
Add colordiff for git to contrib/colordiff.
gitk: Let git-rev-list do the argument list parsing
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) |