[PATCH 30/83] builtin/apply: move 'has_include' global into 'struct apply_state'
From: Christian Couder <hidden>
Date: 2016-06-16 02:18:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Christian Couder <hidden>
Date: 2016-06-16 02:18:57
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Christian Couder <redacted> --- builtin/apply.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index c8b9bf0..0717cd2 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c@@ -70,6 +70,7 @@ struct apply_state { const char *patch_input_file; struct string_list limit_by_name; + int has_include; }; static int newfd = -1;
@@ -1976,7 +1977,6 @@ static void prefix_patch(struct apply_state *state, struct patch *p) * include/exclude */ -static int has_include; static void add_name_limit(struct apply_state *state, const char *name, int exclude)
@@ -2012,7 +2012,7 @@ static int use_patch(struct apply_state *state, struct patch *p) * not used. Otherwise, we saw bunch of exclude rules (or none) * and such a path is used. */ - return !has_include; + return !state->has_include; }
@@ -4550,7 +4550,7 @@ static int option_parse_include(const struct option *opt, { struct apply_state *state = opt->value; add_name_limit(state, arg, 0); - has_include = 1; + state->has_include = 1; return 0; }
--
2.8.1.300.g5fed0c0