Signed-off-by: Christian Couder <chriscool@xxxxxxxxxxxxx>
---
builtin/apply.c | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/builtin/apply.c b/builtin/apply.c
index 85aa817..fd5cb7d 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -34,6 +34,9 @@ struct apply_state {
/* --cached updates only the cache without ever touching the working tree. */
int cached;
+ /* --stat does just a diffstat, and doesn't actually apply */
+ int diffstat;
+
/*
* --check turns on checking that the working tree matches the
* files that are being modified, but doesn't apply the patch
@@ -49,14 +52,12 @@ struct apply_state {
};
/*
- * --stat does just a diffstat, and doesn't actually apply
* --numstat does numeric diffstat, and doesn't actually apply
* --index-info shows the old and new index info for paths if available.
*/
static int p_value = 1;
static int p_value_known;
-static int diffstat;
static int numstat;
static int summary;
static int apply = 1;
@@ -4494,7 +4495,7 @@ static int apply_patch(struct apply_state *state,
if (fake_ancestor)
build_fake_ancestor(list, fake_ancestor);
- if (diffstat)
+ if (state->diffstat)
stat_patch_list(list);
if (numstat)
@@ -4591,7 +4592,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
0, option_parse_p },
OPT_BOOL(0, "no-add", &no_add,
N_("ignore additions made by the patch")),
- OPT_BOOL(0, "stat", &diffstat,
+ OPT_BOOL(0, "stat", &state.diffstat,
N_("instead of applying the patch, output diffstat for the input")),
OPT_NOOP_NOARG(0, "allow-binary-replacement"),
OPT_NOOP_NOARG(0, "binary"),
@@ -4673,7 +4674,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix_)
}
if (state.apply_with_reject)
apply = state.apply_verbosely = 1;
- if (!force_apply && (diffstat || numstat || summary || state.check || fake_ancestor))
+ if (!force_apply && (state.diffstat || numstat || summary || state.check || fake_ancestor))
apply = 0;
if (state.check_index && is_not_gitdir)
die(_("--index outside a repository"));
--
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