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>

diff --git a/builtin/apply.c b/builtin/apply.c
index 7bab466fe2dd6e8d7735cd79eaa19befa96f37e6..5a1d65a69536ce899e4e51b00f65316805a0bd44 100644 (file)
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -79,7 +79,6 @@ static enum ws_ignore {
 static const char *patch_input_file;
 static struct strbuf root = STRBUF_INIT;
 static int read_stdin = 1;
 static const char *patch_input_file;
 static struct strbuf root = STRBUF_INIT;
 static int read_stdin = 1;

-static int options;

 
 static void parse_whitespace_option(const char *option)
 {
 
 static void parse_whitespace_option(const char *option)
 {


@@ -4517,6 +4516,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
        int errs = 0;
        int is_not_gitdir = !startup_info->have_repository;
        int force_apply = 0;
        int errs = 0;
        int is_not_gitdir = !startup_info->have_repository;
        int force_apply = 0;

+       int options = 0;

 
        const char *whitespace_option = NULL;
 
 
        const char *whitespace_option = NULL;