Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 7d7a8ab..838e46a 100644
--- 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 int options;
static void parse_whitespace_option(const char *option)
{
@@ -4516,6 +4515,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 options = 0;
const char *whitespace_option = NULL;
--
2.8.0.rc1.49.gca61272
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html