Signed-off-by: Christian Couder <[email protected]>
---
builtin/apply.c | 37 ++++++++++++++++++++-----------------
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index d427c3c..dbb9f0b 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -28,6 +28,12 @@ enum ws_error_action {
correct_ws_error
};
+
+enum ws_ignore {
+ ignore_ws_none,
+ ignore_ws_change
+};
+
struct apply_state {
const char *prefix;
int prefix_length;
@@ -92,6 +98,7 @@ struct apply_state {
int applied_after_fixing_ws;
enum ws_error_action ws_error_action;
+ enum ws_ignore ws_ignore_action;
};
static const char * const apply_usage[] = {
@@ -99,13 +106,6 @@ static const char * const apply_usage[] = {
NULL
};
-
-static enum ws_ignore {
- ignore_ws_none,
- ignore_ws_change
-} ws_ignore_action = ignore_ws_none;
-
-
static void parse_whitespace_option(struct apply_state *state, const char
*option)
{
if (!option) {
@@ -136,16 +136,17 @@ static void parse_whitespace_option(struct apply_state
*state, const char *optio
die(_("unrecognized whitespace option '%s'"), option);
}
-static void parse_ignorewhitespace_option(const char *option)
+static void parse_ignorewhitespace_option(struct apply_state *state,
+ const char *option)
{
if (!option || !strcmp(option, "no") ||
!strcmp(option, "false") || !strcmp(option, "never") ||
!strcmp(option, "none")) {
- ws_ignore_action = ignore_ws_none;
+ state->ws_ignore_action = ignore_ws_none;
return;
}
if (!strcmp(option, "change")) {
- ws_ignore_action = ignore_ws_change;
+ state->ws_ignore_action = ignore_ws_change;
return;
}
die(_("unrecognized whitespace ignore option '%s'"), option);
@@ -2508,7 +2509,7 @@ static int match_fragment(struct apply_state *state,
* fuzzy matching. We collect all the line length information because
* we need it to adjust whitespace if we match.
*/
- if (ws_ignore_action == ignore_ws_change) {
+ if (state->ws_ignore_action == ignore_ws_change) {
return line_by_line_fuzzy_match(img, preimage, postimage, try,
try_lno, preimage_limit);
}
@@ -4625,12 +4626,13 @@ static int option_parse_p(const struct option *opt,
}
static int option_parse_space_change(const struct option *opt,
- const char *arg, int unset)
+ const char *arg, int unset)
{
+ struct apply_state *state = opt->value;
if (unset)
- ws_ignore_action = ignore_ws_none;
+ state->ws_ignore_action = ignore_ws_none;
else
- ws_ignore_action = ignore_ws_change;
+ state->ws_ignore_action = ignore_ws_change;
return 0;
}
@@ -4705,10 +4707,10 @@ int cmd_apply(int argc, const char **argv, const char
*prefix_)
{ OPTION_CALLBACK, 0, "whitespace", &state, N_("action"),
N_("detect new or modified lines that have whitespace
errors"),
0, option_parse_whitespace },
- { OPTION_CALLBACK, 0, "ignore-space-change", NULL, NULL,
+ { OPTION_CALLBACK, 0, "ignore-space-change", &state, NULL,
N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change },
- { OPTION_CALLBACK, 0, "ignore-whitespace", NULL, NULL,
+ { OPTION_CALLBACK, 0, "ignore-whitespace", &state, NULL,
N_("ignore changes in whitespace when finding context"),
PARSE_OPT_NOARG, option_parse_space_change },
OPT_BOOL('R', "reverse", &state.apply_in_reverse,
@@ -4742,13 +4744,14 @@ int cmd_apply(int argc, const char **argv, const char
*prefix_)
state.p_context = UINT_MAX;
state.squelch_whitespace_errors = 5;
state.ws_error_action = warn_on_ws_error;
+ state.ws_ignore_action = ignore_ws_none;
strbuf_init(&state.root, 0);
git_apply_config();
if (apply_default_whitespace)
parse_whitespace_option(&state, apply_default_whitespace);
if (apply_default_ignorewhitespace)
- parse_ignorewhitespace_option(apply_default_ignorewhitespace);
+ parse_ignorewhitespace_option(&state,
apply_default_ignorewhitespace);
argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
apply_usage, 0);
--
2.8.0.rc1.49.gca61272
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
