Always set *nongit_ok in setup_git_directory_gently()

setup_git_directory_gently() only modified the value of its *nongit_ok
argument if we were not in a git repository.  Now it will always set it
to 0 when we are inside a repository.

Also remove now unnecessary initializations in the callers of this
function.

Signed-off-by: SZEDER Gábor <szeder@ira.uka.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-apply.c b/builtin-apply.c
index a3f075df4bd91de8d3423420cfcffd9722ad9586..b5f78ac3a78679fdb747380305fb6772c39874e0 100644 (file)
--- a/builtin-apply.c
+++ b/builtin-apply.c
@@ -2994,7 +2994,7 @@ int cmd_apply(int argc, const char **argv, const char *unused_prefix)
        int read_stdin = 1;
        int inaccurate_eof = 0;
        int errs = 0;
        int read_stdin = 1;
        int inaccurate_eof = 0;
        int errs = 0;

-       int is_not_gitdir = 0;
+       int is_not_gitdir;

 
        const char *whitespace_option = NULL;
 
 
        const char *whitespace_option = NULL;
 

diff --git a/builtin-bundle.c b/builtin-bundle.c
index 9f38e2176a4c05fe9f6f8efcabb9b1e7204fdb85..ac476e7a4b45fc55b6b6d1e4d02be0c35aba2c7b 100644 (file)
--- a/builtin-bundle.c
+++ b/builtin-bundle.c
@@ -14,7 +14,7 @@ static const char *bundle_usage="git-bundle (create <bundle> <git-rev-list args>
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;
 int cmd_bundle(int argc, const char **argv, const char *prefix)
 {
        struct bundle_header header;

-       int nongit = 0;
+       int nongit;

        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];
        const char *cmd, *bundle_file;
        int bundle_fd = -1;
        char buffer[PATH_MAX];

diff --git a/builtin-config.c b/builtin-config.c
index 2b9a4261d4e98281855ce856041eb730565a4869..c34bc8b6a6957ccee1db23a3c44c99e058384689 100644 (file)
--- a/builtin-config.c
+++ b/builtin-config.c
@@ -264,7 +264,7 @@ static int get_colorbool(int argc, const char **argv)
 
 int cmd_config(int argc, const char **argv, const char *prefix)
 {
 
 int cmd_config(int argc, const char **argv, const char *prefix)
 {

-       int nongit = 0;
+       int nongit;

        char* value;
        const char *file = setup_git_directory_gently(&nongit);
 
        char* value;
        const char *file = setup_git_directory_gently(&nongit);
 

diff --git a/builtin-diff-files.c b/builtin-diff-files.c
index 4abe3c28fbf98542db35c13f618b7088225740e9..e2306c162a55df30042a0bf87c9a60a1e02f5396 100644 (file)
--- a/builtin-diff-files.c
+++ b/builtin-diff-files.c
@@ -16,7 +16,7 @@ COMMON_DIFF_OPTIONS_HELP;
 int cmd_diff_files(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;
 int cmd_diff_files(int argc, const char **argv, const char *prefix)
 {
        struct rev_info rev;

-       int nongit = 0;
+       int nongit;

        int result;
 
        prefix = setup_git_directory_gently(&nongit);
        int result;
 
        prefix = setup_git_directory_gently(&nongit);

diff --git a/builtin-diff.c b/builtin-diff.c
index 444ff2fd92da38ab4002af6a1882839c1c3d930a..7c2a8412fa8cefa2f53a5f7c2035ea9f2536e1c4 100644 (file)
--- a/builtin-diff.c
+++ b/builtin-diff.c
@@ -210,7 +210,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        int ents = 0, blobs = 0, paths = 0;
        const char *path = NULL;
        struct blobinfo blob[2];
        int ents = 0, blobs = 0, paths = 0;
        const char *path = NULL;
        struct blobinfo blob[2];

-       int nongit = 0;
+       int nongit;

        int result = 0;
 
        /*
        int result = 0;
 
        /*

diff --git a/builtin-ls-remote.c b/builtin-ls-remote.c
index 8907a89d6c3914f4652ef387776f581015778396..06ab8da1fb1e5ebc5fedb82e74d7e6a7374cee0e 100644 (file)
--- a/builtin-ls-remote.c
+++ b/builtin-ls-remote.c
@@ -31,7 +31,7 @@ int cmd_ls_remote(int argc, const char **argv, const char *prefix)
 {
        int i;
        const char *dest = NULL;
 {
        int i;
        const char *dest = NULL;

-       int nongit = 0;
+       int nongit;

        unsigned flags = 0;
        const char *uploadpack = NULL;
        const char **pattern = NULL;
        unsigned flags = 0;
        const char *uploadpack = NULL;
        const char **pattern = NULL;

diff --git a/git.c b/git.c
index 13de8018f0451c1e36d8fbc8f8c10233d2b45be9..b7729d72cf8dcec32215e968d39dcf675302e216 100644 (file)
--- a/git.c
+++ b/git.c
@@ -142,14 +142,14 @@ static int split_cmdline(char *cmdline, const char ***argv)
 
 static int handle_alias(int *argcp, const char ***argv)
 {
 
 static int handle_alias(int *argcp, const char ***argv)
 {

-       int nongit = 0, envchanged = 0, ret = 0, saved_errno = errno;
+       int envchanged = 0, ret = 0, saved_errno = errno;

        const char *subdir;
        int count, option_count;
        const char** new_argv;
        const char *alias_command;
        char *alias_string;
 
        const char *subdir;
        int count, option_count;
        const char** new_argv;
        const char *alias_command;
        char *alias_string;
 

-       subdir = setup_git_directory_gently(&nongit);
+       subdir = setup_git_directory_gently(NULL);

 
        alias_command = (*argv)[0];
        alias_string = alias_lookup(alias_command);
 
        alias_command = (*argv)[0];
        alias_string = alias_lookup(alias_command);

diff --git a/setup.c b/setup.c
index 41e298b8f549dcce28fca335c5f5b7fe5aea27bb..3d2d9580f3283b4e4bc741d98863777510bd5173 100644 (file)
--- a/setup.c
+++ b/setup.c
@@ -325,6 +325,14 @@ const char *setup_git_directory_gently(int *nongit_ok)
        const char *gitdirenv;
        int len, offset;
 
        const char *gitdirenv;
        int len, offset;
 

+       /*
+        * Let's assume that we are in a git repository.
+        * If it turns out later that we are somewhere else, the value will be
+        * updated accordingly.
+        */
+       if (nongit_ok)
+               *nongit_ok = 0;
+

        /*
         * If GIT_DIR is set explicitly, we're not going
         * to do any discovery, but we still do repository
        /*
         * If GIT_DIR is set explicitly, we're not going
         * to do any discovery, but we still do repository