[PATCH] Fix test failure due to overly strict .git directory tests
[gitweb.git] / rev-parse.c
index 1965e90a8a0c3fa25c2fccfcc82f5da395a093bc..39cf63540e389683e020563f6f3a1f51f44c2f20 100644 (file)
@@ -33,6 +33,9 @@ static int is_rev_argument(const char *arg)
                "--max-age=",
                "--min-age=",
                "--merge-order",
+               "--topo-order",
+               "--bisect",
+               "--no-merges",
                NULL
        };
        const char **p = rev_args;
@@ -131,7 +134,8 @@ int main(int argc, char **argv)
 {
        int i, as_is = 0;
        unsigned char sha1[20];
-
+       const char *prefix = setup_git_directory();
+       
        for (i = 1; i < argc; i++) {
                char *arg = argv[i];
                char *dotdot;
@@ -186,6 +190,10 @@ int main(int argc, char **argv)
                                for_each_ref(show_reference);
                                continue;
                        }
+                       if (!strcmp(arg, "--show-prefix")) {
+                               puts(prefix);
+                               continue;
+                       }
                        show_arg(arg);
                        continue;
                }