git-diff: turn on recursion by default

diff --git a/setup.c b/setup.c
index 14a4d955b5bec90251f2c464d4086b08945b8b59..7b07144af7b0ea96eb2fcd65098331768e46ca3b 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -39,7 +39,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        if (len) {
                int speclen = strlen(path);
                char *n = xmalloc(speclen + len + 1);
-       
+
                memcpy(n, prefix, len);
                memcpy(n + len, path, speclen+1);
                path = n;
@@ -47,7 +47,7 @@ const char *prefix_path(const char *prefix, int len, const char *path)
        return path;
 }
 
-/* 
+/*
  * Unlike prefix_path, this should be used if the named file does
  * not have to interact with index entry; i.e. name of a random file
  * on the filesystem.
@@ -211,7 +211,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
        if (!gitdirenv) {
                int len, offset;
 
-               if (!getcwd(cwd, sizeof(cwd)-1) || cwd[0] != '/')
+               if (!getcwd(cwd, sizeof(cwd)-1))
                        die("Unable to read current working directory");
 
                offset = len = strlen(cwd);
@@ -251,6 +251,9 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        die("Not a git repository");
                }
                setenv(GIT_DIR_ENVIRONMENT, cwd, 1);
+               gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
+               if (!gitdirenv)
+                       die("getenv after setenv failed");
        }
 
        if (PATH_MAX - 40 < strlen(gitdirenv)) {
@@ -268,7 +271,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                die("Not a git repository: '%s'", gitdirenv);
        }
 
-       if (!getcwd(cwd, sizeof(cwd)-1) || cwd[0] != '/')
+       if (!getcwd(cwd, sizeof(cwd)-1))
                die("Unable to read current working directory");
        if (chdir(gitdirenv)) {
                if (nongit_ok) {
@@ -278,7 +281,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                die("Cannot change directory to $%s '%s'",
                        GIT_DIR_ENVIRONMENT, gitdirenv);
        }
-       if (!getcwd(gitdir, sizeof(gitdir)-1) || gitdir[0] != '/')
+       if (!getcwd(gitdir, sizeof(gitdir)-1))
                die("Unable to read current working directory");
        if (chdir(cwd))
                die("Cannot come back to cwd");
@@ -290,6 +293,8 @@ const char *setup_git_directory_gently(int *nongit_ok)
        if (gitdirenv[0] != '/') {
                setenv(GIT_DIR_ENVIRONMENT, gitdir, 1);
                gitdirenv = getenv(GIT_DIR_ENVIRONMENT);
+               if (!gitdirenv)
+                       die("getenv after setenv failed");
                if (PATH_MAX - 40 < strlen(gitdirenv)) {
                        if (nongit_ok) {
                                *nongit_ok = 1;
@@ -335,7 +340,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
                        die("Cannot change directory to working tree '%s'",
                                gitworktree);
        }
-       if (!getcwd(worktree, sizeof(worktree)-1) || worktree[0] != '/')
+       if (!getcwd(worktree, sizeof(worktree)-1))
                die("Unable to read current working directory");
        strcat(worktree, "/");
        inside_work_tree = !prefixcmp(cwd, worktree);
@@ -359,6 +364,7 @@ const char *setup_git_directory_gently(int *nongit_ok)
 int git_config_perm(const char *var, const char *value)
 {
        if (value) {
+               int i;
                if (!strcmp(value, "umask"))
                        return PERM_UMASK;
                if (!strcmp(value, "group"))
@@ -367,6 +373,9 @@ int git_config_perm(const char *var, const char *value)
                    !strcmp(value, "world") ||
                    !strcmp(value, "everybody"))
                        return PERM_EVERYBODY;
+               i = atoi(value);
+               if (i > 1)
+                       return i;
        }
        return git_config_bool(var, value);
 }