Signed-off-by: Christian Couder <chrisc...@tuxfamily.org>
---
builtin/apply.c | 24 ++++++++++++------------
1 file changed, 12 insertions(+), 12 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index fcb3c14..4e0737c 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -28,6 +28,7 @@ struct apply_state {
int apply_in_reverse;
int apply_with_reject;
+ int apply_verbosely;
/*
* --check turns on checking that the working tree matches the
@@ -56,7 +57,6 @@ static int diffstat;
static int numstat;
static int summary;
static int apply = 1;
-static int apply_verbosely;
static int allow_overlap;
static int no_add;
static int threeway;
@@ -2814,7 +2814,7 @@ static int apply_one_fragment(struct apply_state *state,
/* Ignore it, we already handled it */
break;
default:
- if (apply_verbosely)
+ if (state->apply_verbosely)
error(_("invalid start of line: '%c'"), first);
applied_pos = -1;
goto out;
@@ -2929,7 +2929,7 @@ static int apply_one_fragment(struct apply_state *state,
apply = 0;
}
- if (apply_verbosely && applied_pos != pos) {
+ if (state->apply_verbosely && applied_pos != pos) {
int offset = applied_pos - pos;
if (state->apply_in_reverse)
offset = 0 - offset;
@@ -2951,7 +2951,7 @@ static int apply_one_fragment(struct apply_state *state,
leading, trailing, applied_pos+1);
update_image(img, applied_pos, &preimage, &postimage);
} else {
- if (apply_verbosely)
+ if (state->apply_verbosely)
error(_("while searching for:\n%.*s"),
(int)(old - oldlines), oldlines);
}
@@ -3865,7 +3865,7 @@ static int check_patch_list(struct apply_state *state,
struct patch *patch)
prepare_symlink_changes(patch);
prepare_fn_table(patch);
while (patch) {
- if (apply_verbosely)
+ if (state->apply_verbosely)
say_patch_name(stderr,
_("Checking patch %s..."), patch);
err |= check_patch(state, patch);
@@ -4296,7 +4296,7 @@ static void write_out_one_result(struct patch *patch, int
phase)
create_file(patch);
}
-static int write_out_one_reject(struct patch *patch)
+static int write_out_one_reject(struct apply_state *state, struct patch *patch)
{
FILE *rej;
char namebuf[PATH_MAX];
@@ -4311,7 +4311,7 @@ static int write_out_one_reject(struct patch *patch)
}
if (!cnt) {
- if (apply_verbosely)
+ if (state->apply_verbosely)
say_patch_name(stderr,
_("Applied patch %s cleanly."), patch);
return 0;
@@ -4367,7 +4367,7 @@ static int write_out_one_reject(struct patch *patch)
return -1;
}
-static int write_out_results(struct patch *list)
+static int write_out_results(struct apply_state *state, struct patch *list)
{
int phase;
int errs = 0;
@@ -4382,7 +4382,7 @@ static int write_out_results(struct patch *list)
else {
write_out_one_result(l, phase);
if (phase == 1) {
- if (write_out_one_reject(l))
+ if (write_out_one_reject(state, l))
errs = 1;
if (l->conflicted_threeway) {
string_list_append(&cpath,
l->new_name);
@@ -4470,7 +4470,7 @@ static int apply_patch(struct apply_state *state,
!state->apply_with_reject)
exit(1);
- if (apply && write_out_results(list)) {
+ if (apply && write_out_results(state, list)) {
if (state->apply_with_reject)
exit(1);
/* with --3way, we still need to write the index out */
@@ -4621,7 +4621,7 @@ int cmd_apply(int argc, const char **argv, const char
*prefix_)
N_("leave the rejected hunks in corresponding *.rej
files")),
OPT_BOOL(0, "allow-overlap", &allow_overlap,
N_("allow overlapping hunks")),
- OPT__VERBOSE(&apply_verbosely, N_("be verbose")),
+ OPT__VERBOSE(&state.apply_verbosely, N_("be verbose")),
OPT_BIT(0, "inaccurate-eof", &options,
N_("tolerate incorrectly detected missing new-line at
the end of file"),
INACCURATE_EOF),
@@ -4658,7 +4658,7 @@ int cmd_apply(int argc, const char **argv, const char
*prefix_)
state.check_index = 1;
}
if (state.apply_with_reject)
- apply = apply_verbosely = 1;
+ apply = state.apply_verbosely = 1;
if (!force_apply && (diffstat || numstat || summary || state.check ||
fake_ancestor))
apply = 0;
if (state.check_index && is_not_gitdir)
--
2.8.0.rc1.49.gca61272
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
