aboutsummaryrefslogtreecommitdiff
path: root/builtin-apply.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 /builtin-apply.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 'builtin-apply.c')
-rw-r--r--builtin-apply.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/builtin-apply.c b/builtin-apply.c
index a3f075df4..b5f78ac3a 100644
--- 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 is_not_gitdir = 0;
+ int is_not_gitdir;
const char *whitespace_option = NULL;