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>
This commit is contained in:
committed by
Junio C Hamano
parent
660b9c3a4e
commit
af05d67939
4
git.c
4
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);
|
||||
|
||||
Reference in New Issue
Block a user