Merge branch 'fl/send-email-outside'

[git.git] / git.c

diff --git a/git.c b/git.c
index 13de8018f0451c1e36d8fbc8f8c10233d2b45be9..c4e4644b30e184e6496fb5a4877f3141488f8f44 100644 (file)
--- a/git.c
+++ b/git.c
@@ -142,14 +142,15 @@ static int split_cmdline(char *cmdline, 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;
+       int unused_nongit;
 
-       subdir = setup_git_directory_gently(&nongit);
+       subdir = setup_git_directory_gently(&unused_nongit);
 
        alias_command = (*argv)[0];
        alias_string = alias_lookup(alias_command);