Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 8d4a900..cb995c8 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -67,6 +67,7 @@ struct apply_state {
int line_termination;
int p_value;
+ int p_value_known;
unsigned int p_context;
struct lock_file lock_file;
@@ -77,8 +78,6 @@ struct apply_state {
int has_include;
};
-static int p_value_known;
-
static const char * const apply_usage[] = {
N_("git apply [<options>] [<patch>...]"),
NULL
@@ -891,14 +890,14 @@ static void parse_traditional_patch(struct apply_state *state,
first += 4; /* skip "--- " */
second += 4; /* skip "+++ " */
- if (!p_value_known) {
+ if (!state->p_value_known) {
int p, q;
p = guess_p_value(state, first);
q = guess_p_value(state, second);
if (p < 0) p = q;
if (0 <= p && p == q) {
state->p_value = p;
- p_value_known = 1;
+ state->p_value_known = 1;
}
}
if (is_dev_null(first)) {
@@ -4601,7 +4600,7 @@ static int option_parse_p(const struct option *opt,
{
struct apply_state *state = opt->value;
state->p_value = atoi(arg);
- p_value_known = 1;
+ state->p_value_known = 1;
return 0;
}
--
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