diff options
| -rwxr-xr-x | git-sh-setup-script | 3 | ||||
| -rw-r--r-- | setup.c | 31 |
2 files changed, 21 insertions, 13 deletions
diff --git a/git-sh-setup-script b/git-sh-setup-script index 5bf471f78..84e15df1b 100755 --- a/git-sh-setup-script +++ b/git-sh-setup-script @@ -11,7 +11,6 @@ die() { exit 1 } -[ -d "$GIT_DIR" ] && +[ -h "$GIT_DIR/HEAD" ] && [ -d "$GIT_DIR/refs" ] && -[ -d "$GIT_OBJECT_DIRECTORY" ] && [ -d "$GIT_OBJECT_DIRECTORY/00" ] @@ -72,6 +72,24 @@ const char **get_pathspec(const char *prefix, char **pathspec) return (const char **) pathspec; } +/* + * Test it it looks like we're at the top + * level git directory. We want to see a + * + * - a HEAD symlink and a refs/ directory under ".git" + * - either a .git/objects/ directory _or_ the proper + * GIT_OBJECT_DIRECTORY environment variable + */ +static int is_toplevel_directory(void) +{ + struct stat st; + + return !lstat(".git/HEAD", &st) && + S_ISLNK(st.st_mode) && + !access(".git/refs/", X_OK) && + (gitenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK)); +} + const char *setup_git_directory(void) { static char cwd[PATH_MAX+1]; @@ -89,17 +107,8 @@ const char *setup_git_directory(void) offset = len = strlen(cwd); for (;;) { - /* - * We always want to see a .git/refs/ subdirectory - */ - if (!access(".git/refs/", X_OK)) { - /* - * Then we need either a GIT_OBJECT_DIRECTORY define - * or a .git/objects/ directory - */ - if (gitenv(DB_ENVIRONMENT) || !access(".git/objects/", X_OK)) - break; - } + if (is_toplevel_directory()) + break; chdir(".."); do { if (!offset) |