builtin/apply: move 'summary' global into 'struct apply_state'
To libify the apply functionality the 'summary' variable should not be static and global to the file. Let's move it into 'struct apply_state'. Reviewed-by: Stefan Beller <sbeller@google.com> Signed-off-by: Christian Couder <chriscool@tuxfamily.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Christian Couder committed
May 24, 2016 at 10:10 UTC
79a3efda795a88403cea3e9ff321b4b668f393d9
1 file changed
+4
-4
builtin/apply.c
+4
-4
@@ -34,6 +34,7 @@ struct apply_state {
34
/* These control cosmetic aspect of the output */
35
int diffstat; /* just show a diffstat, and don't actually apply */
36
int numstat; /* just show a numeric diffstat, and don't actually apply */
37
+ int summary; /* just report creation, deletion, etc, and don't actually apply */
38
39
/* These boolean parameters control how the apply is done */
40
int allow_overlap;
@@ -50,7 +51,6 @@ static int newfd = -1;
51
52
static int state_p_value = 1;
53
static int p_value_known;
53
-static int summary;
54
static int apply = 1;
55
static int no_add;
56
static int threeway;
@@ -4492,7 +4492,7 @@ static int apply_patch(struct apply_state *state,
4492
if (state->numstat)
4493
numstat_patch_list(list);
4494
4495
- if (summary)
4495
+ if (state->summary)
4496
summary_patch_list(list);
4497
4498
free_patch_list(list);
@@ -4608,7 +4608,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
4608
OPT_NOOP_NOARG(0, "binary"),
4609
OPT_BOOL(0, "numstat", &state.numstat,
4610
N_("show number of added and deleted lines in decimal notation")),
4611
- OPT_BOOL(0, "summary", &summary,
4611
+ OPT_BOOL(0, "summary", &state.summary,
4612
N_("instead of applying the patch, output a summary for the input")),
4613
OPT_BOOL(0, "check", &state.check,
4614
N_("instead of applying the patch, see if the patch is applicable")),
@@ -4675,7 +4675,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
4675
}
4676
if (state.apply_with_reject)
4677
apply = state.apply_verbosely = 1;
4678
- if (!force_apply && (state.diffstat || state.numstat || summary || state.check || fake_ancestor))
4678
+ if (!force_apply && (state.diffstat || state.numstat || state.summary || state.check || fake_ancestor))
4679
apply = 0;
4680
if (state.check_index && is_not_gitdir)
4681
die(_("--index outside a repository"));