Use symbolic name SHORT_NAME_AMBIGUOUS as error return value

[git.git] / rev-parse.c

diff --git a/rev-parse.c b/rev-parse.c
index bb4949a..7abad35 100644 (file)
--- a/rev-parse.c
+++ b/rev-parse.c
@@ -154,6 +154,7 @@ int main(int argc, char **argv)
        const char *prefix = setup_git_directory();
        
        for (i = 1; i < argc; i++) {
+               struct stat st;
                char *arg = argv[i];
                char *dotdot;
        
@@ -216,6 +217,18 @@ int main(int argc, char **argv)
                                        puts(prefix);
                                continue;
                        }
+                       if (!strcmp(arg, "--show-cdup")) {
+                               const char *pfx = prefix;
+                               while (pfx) {
+                                       pfx = strchr(pfx, '/');
+                                       if (pfx) {
+                                               pfx++;
+                                               printf("../");
+                                       }
+                               }
+                               putchar('\n');
+                               continue;
+                       }
                        if (!strcmp(arg, "--git-dir")) {
                                const char *gitdir = getenv(GIT_DIR_ENVIRONMENT);
                                static char cwd[PATH_MAX];
@@ -281,6 +294,8 @@ int main(int argc, char **argv)
                }
                if (verify)
                        die("Needed a single revision");
+               if (lstat(arg, &st) < 0)
+                       die("'%s': %s", arg, strerror(errno));
                as_is = 1;
                show_file(arg);
        }