Document the configuration file

[git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index f176c56..7f66ae2 100644 (file)
--- 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")) {
@@ -315,16 +323,17 @@ int main(int argc, char **argv)
                dotdot = strstr(arg, "..");
                if (dotdot) {
                        unsigned char end[20];
-                       char *n = dotdot+2;
+                       char *next = dotdot + 2;
+                       char *this = arg;
                        *dotdot = 0;
-                       if (!get_sha1(arg, sha1)) {
-                               if (!*n)
-                                       n = "HEAD";
-                               if (!get_sha1(n, end)) {
-                                       show_rev(NORMAL, end, n);
-                                       show_rev(REVERSED, sha1, arg);
-                                       continue;
-                               }
+                       if (!*next)
+                               next = "HEAD";
+                       if (dotdot == arg)
+                               this = "HEAD";
+                       if (!get_sha1(this, sha1) && !get_sha1(next, end)) {
+                               show_rev(NORMAL, end, next);
+                               show_rev(REVERSED, sha1, this);
+                               continue;
                        }
                        *dotdot = '.';
                }
@@ -342,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)