builtin/apply: move 'options' variable into cmd_apply()
The 'options' variable doesn't need to be static and global to the file. It can be local to cmd_apply(), so let's move it there. This will make it easier to libify the apply functionality. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
May 11, 2016 at 15:16 UTC
d1b27ced9a38ed03e99422b6cb24ff95c7437663
1 file changed
+1
-1
builtin/apply.c
+1
-1
@@ -79,7 +79,6 @@ static enum ws_ignore {
79
static const char *patch_input_file;
80
static struct strbuf root = STRBUF_INIT;
81
static int read_stdin = 1;
82
-static int options;
82
83
static void parse_whitespace_option(const char *option)
84
{
@@ -4517,6 +4516,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
4516
int errs = 0;
4517
int is_not_gitdir = !startup_info->have_repository;
4518
int force_apply = 0;
4519
+ int options = 0;
4520
4521
const char *whitespace_option = NULL;
4522