Support working directory located at root

Git should work regardless where the working directory is located,
even at root. This patch fixes two places where it assumes working
directory always have parent directory.

In setup_git_directory_gently(), when Git goes up to root and finds
.git there, it happily sets worktree to "" instead of "/".

In prefix_path(), loosen the outside repo check a little bit. Usually
when a path XXX is inside worktree /foo, it must be either "/foo", or
"/foo/...". When worktree is simply "/", we can safely ignore the
check: we have a slash at the beginning already.

Not related to worktree, but also set gitdir correctly if a bare repo
is placed (insanely?) at root.

Thanks João Carlos Mendes Luís for pointing out this problem.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/setup.c b/setup.c
index 2cf0f1993718fd737cd87e79d2f4950832c59c9f..3b9efdbaea837b9b91a51f950affbc8bf6b5344f 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -18,14 +18,15 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        if (normalize_path_copy(sanitized, sanitized))
                goto error_out;
        if (is_absolute_path(orig)) {
        if (normalize_path_copy(sanitized, sanitized))
                goto error_out;
        if (is_absolute_path(orig)) {

-               size_t len, total;
+               size_t root_len, len, total;

                const char *work_tree = get_git_work_tree();
                if (!work_tree)
                        goto error_out;
                len = strlen(work_tree);
                const char *work_tree = get_git_work_tree();
                if (!work_tree)
                        goto error_out;
                len = strlen(work_tree);

+               root_len = offset_1st_component(work_tree);

                total = strlen(sanitized) + 1;
                if (strncmp(sanitized, work_tree, len) ||
                total = strlen(sanitized) + 1;
                if (strncmp(sanitized, work_tree, len) ||

-                   (sanitized[len] != '\0' && sanitized[len] != '/')) {
+                   (len > root_len && sanitized[len] != '\0' && sanitized[len] != '/')) {

                error_out:
                        die("'%s' is outside repository", orig);
                }
                error_out:
                        die("'%s' is outside repository", orig);
                }


@@ -294,7 +295,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
        static char cwd[PATH_MAX+1];
        const char *gitdirenv;
        const char *gitfile_dir;
        static char cwd[PATH_MAX+1];
        const char *gitdirenv;
        const char *gitfile_dir;

-       int len, offset, ceil_offset;
+       int len, offset, ceil_offset, root_len;

 
        /*
         * Let's assume that we are in a git repository.
 
        /*
         * Let's assume that we are in a git repository.


@@ -376,10 +377,11 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        if (!work_tree_env)
                                inside_work_tree = 0;
                        if (offset != len) {
                        if (!work_tree_env)
                                inside_work_tree = 0;
                        if (offset != len) {

-                               cwd[offset] = '\0';
-                               setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
+                               root_len = offset_1st_component(cwd);
+                               cwd[offset > root_len ? offset : root_len] = '\0';
+                               set_git_dir(cwd);

                        } else
                        } else

-                               setenv(GIT_DIR_ENVIRONMENT, ".", 1);
+                               set_git_dir(".");

                        check_repository_format_gently(nongit_ok);
                        return NULL;
                }
                        check_repository_format_gently(nongit_ok);
                        return NULL;
                }


@@ -400,7 +402,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
        inside_git_dir = 0;
        if (!work_tree_env)
                inside_work_tree = 1;
        inside_git_dir = 0;
        if (!work_tree_env)
                inside_work_tree = 1;

-       git_work_tree_cfg = xstrndup(cwd, offset);
+       root_len = offset_1st_component(cwd);
+       git_work_tree_cfg = xstrndup(cwd, offset > root_len ? offset : root_len);

        if (check_repository_format_gently(nongit_ok))
                return NULL;
        if (offset == len)
        if (check_repository_format_gently(nongit_ok))
                return NULL;
        if (offset == len)