projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rebase: typofix.
[git.git]
/
rev-parse.c
diff --git
a/rev-parse.c
b/rev-parse.c
index
e956cd5
..
7f66ae2
100644
(file)
--- a/
rev-parse.c
+++ b/
rev-parse.c
@@
-160,6
+160,14
@@
static int show_file(const char *arg)
return 0;
}
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;
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)
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")) {
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)
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)
}
show_default();
if (verify && revs_count != 1)