aboutsummaryrefslogtreecommitdiff
path: root/git.c
diff options
context:
space:
mode:
authorSZEDER Gábor <szeder@ira.uka.de>2008-03-25 22:06:26 +0100
committerJunio C Hamano <gitster@pobox.com>2008-03-26 15:41:35 -0700
commitaf05d67939f306a68c5f81ed30f65a82ae025661 (patch)
tree604f2ab856a425e84f67a5a65c7ee58f74e1d4c8 /git.c
parent660b9c3a4e24ce9a2628f2ec88902e2384d1aade (diff)
downloadgit-af05d67939f306a68c5f81ed30f65a82ae025661.tar.gz
git-af05d67939f306a68c5f81ed30f65a82ae025661.tar.xz
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>
Diffstat (limited to 'git.c')
-rw-r--r--git.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/git.c b/git.c
index 13de8018f..b7729d72c 100644
--- 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)
{
- 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;
- subdir = setup_git_directory_gently(&nongit);
+ subdir = setup_git_directory_gently(NULL);
alias_command = (*argv)[0];
alias_string = alias_lookup(alias_command);