Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 6bf3024..fcb3c14 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -27,6 +27,7 @@ struct apply_state {
int newfd;
int apply_in_reverse;
+ int apply_with_reject;
/*
* --check turns on checking that the working tree matches the
@@ -55,7 +56,6 @@ static int diffstat;
static int numstat;
static int summary;
static int apply = 1;
-static int apply_with_reject;
static int apply_verbosely;
static int allow_overlap;
static int no_add;
@@ -3105,7 +3105,7 @@ static int apply_fragments(struct apply_state *state, struct image *img, struct
nth++;
if (apply_one_fragment(state, img, frag, inaccurate_eof, ws_rule, nth)) {
error(_("patch failed: %s:%ld"), name, frag->oldpos);
- if (!apply_with_reject)
+ if (!state->apply_with_reject)
return -1;
frag->rejected = 1;
}
@@ -4467,11 +4467,11 @@ static int apply_patch(struct apply_state *state,
if ((state->check || apply) &&
check_patch_list(state, list) < 0 &&
- !apply_with_reject)
+ !state->apply_with_reject)
exit(1);
if (apply && write_out_results(list)) {
- if (apply_with_reject)
+ if (state->apply_with_reject)
exit(1);
/* with --3way, we still need to write the index out */
return 1;
@@ -4617,7 +4617,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
N_("apply the patch in reverse")),
OPT_BOOL(0, "unidiff-zero", &state.unidiff_zero,
N_("don't expect at least one line of context")),
- OPT_BOOL(0, "reject", &apply_with_reject,
+ OPT_BOOL(0, "reject", &state.apply_with_reject,
N_("leave the rejected hunks in corresponding *.rej files")),
OPT_BOOL(0, "allow-overlap", &allow_overlap,
N_("allow overlapping hunks")),
@@ -4648,7 +4648,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
argc = parse_options(argc, argv, state.prefix, builtin_apply_options,
apply_usage, 0);
- if (apply_with_reject && threeway)
+ if (state.apply_with_reject && threeway)
die("--reject and --3way cannot be used together.");
if (cached && threeway)
die("--cached and --3way cannot be used together.");
@@ -4657,7 +4657,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
die(_("--3way outside a repository"));
state.check_index = 1;
}
- if (apply_with_reject)
+ if (state.apply_with_reject)
apply = apply_verbosely = 1;
if (!force_apply && (diffstat || numstat || summary || state.check || fake_ancestor))
apply = 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