diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-04-26 17:08:00 -0700 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-04-26 17:08:00 -0700 |
| commit | 69bcc43eca0f251617e3b5db5df632b24db94e92 (patch) | |
| tree | d816d41d36c73f3e665e4a2967a59abef4ce12d3 /rev-parse.c | |
| parent | 3496277a561307c3d31d2085347af8eb4c667c36 (diff) | |
| parent | 5981e09999e90b389a02843671529a0faaf72143 (diff) | |
| download | git-69bcc43eca0f251617e3b5db5df632b24db94e92.tar.gz | |
Merge branch 'fix'
* fix:
commit-tree.c: check_valid() microoptimization.
Fix filename verification when in a subdirectory
rebase: typofix.
socksetup: don't return on set_reuse_addr() error
Diffstat (limited to 'rev-parse.c')
| -rw-r--r-- | rev-parse.c | 15 |
1 files changed, 2 insertions, 13 deletions
diff --git a/rev-parse.c b/rev-parse.c index 7f66ae2db8..62e16af33c 100644 --- a/rev-parse.c +++ b/rev-parse.c @@ -160,14 +160,6 @@ 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; @@ -177,14 +169,12 @@ int main(int argc, char **argv) git_config(git_default_config); for (i = 1; i < argc; i++) { - struct stat st; char *arg = argv[i]; char *dotdot; if (as_is) { if (show_file(arg) && as_is < 2) - if (lstat(arg, &st) < 0) - die_badfile(arg); + verify_filename(prefix, arg); continue; } if (!strcmp(arg,"-n")) { @@ -350,8 +340,7 @@ int main(int argc, char **argv) continue; if (verify) die("Needed a single revision"); - if (lstat(arg, &st) < 0) - die_badfile(arg); + verify_filename(prefix, arg); } show_default(); if (verify && revs_count != 1) |