Merge branch 'ap/cvsserver'

diff --git a/builtin-rev-parse.c b/builtin-rev-parse.c
index 3b716fba133ae2f0375ef73d6a50a4d93112b5e4..d53deaa3691c7b57e215f3f33c44881c4f397527 100644 (file)
--- a/builtin-rev-parse.c
+++ b/builtin-rev-parse.c
@@ -347,6 +347,11 @@ int cmd_rev_parse(int argc, const char **argv, const char *prefix)
                                printf("%s/.git\n", cwd);
                                continue;
                        }
+                       if (!strcmp(arg, "--is-inside-git-dir")) {
+                               printf("%s\n", is_inside_git_dir() ? "true"
+                                               : "false");
+                               continue;
+                       }
                        if (!strncmp(arg, "--since=", 8)) {
                                show_datestring("--max-age=", arg+8);
                                continue;