undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

builtin/apply: move 'fake_ancestor' global into 'struct apply_state'

Browse Source 
To libify the apply functionality the 'fake_ancestor' variable should
not be static and global to the file. Let's move it into
'struct apply_state'.

By the way remove a comment about '--index-info' that was renamed
'--build-fake-ancestor' in commit 26b2800768
(apply: get rid of --index-info in favor of --build-fake-ancestor,
Sep 17 2007).

Reviewed-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Christian Couder 2016-05-24 10:11:03 +02:00 committed by Junio C Hamano
parent f4c9eaa49c
commit a0bfaf0796
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
builtin/apply.c
View File

@ -47,18 +47,15 @@ struct apply_state {
int unsafe_paths; int unsafe_paths;
/* Other non boolean parameters */ /* Other non boolean parameters */
const char *fake_ancestor;
int line_termination; int line_termination;
}; };
/*
* --index-info shows the old and new index info for paths if available.
*/
static int newfd = -1; static int newfd = -1;
static int state_p_value = 1; static int state_p_value = 1;
static int p_value_known; static int p_value_known;
static int apply = 1; static int apply = 1;
static const char *fake_ancestor;
static unsigned int p_context = UINT_MAX; static unsigned int p_context = UINT_MAX;
static const char * const apply_usage[] = { static const char * const apply_usage[] = {
N_("git apply [<options>] [<patch>...]"), N_("git apply [<options>] [<patch>...]"),
@ -4486,8 +4483,8 @@ static int apply_patch(struct apply_state *state,
return 1; return 1;
} }
if (fake_ancestor) if (state->fake_ancestor)
build_fake_ancestor(list, fake_ancestor); build_fake_ancestor(list, state->fake_ancestor);
if (state->diffstat) if (state->diffstat)
stat_patch_list(list); stat_patch_list(list);
@ -4626,7 +4623,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
N_("also apply the patch (use with --stat/--summary/--check)")), N_("also apply the patch (use with --stat/--summary/--check)")),
OPT_BOOL('3', "3way", &state.threeway, OPT_BOOL('3', "3way", &state.threeway,
N_( "attempt three-way merge if a patch does not apply")), N_( "attempt three-way merge if a patch does not apply")),
OPT_FILENAME(0, "build-fake-ancestor", &fake_ancestor, OPT_FILENAME(0, "build-fake-ancestor", &state.fake_ancestor,
N_("build a temporary index based on embedded index information")), N_("build a temporary index based on embedded index information")),
/* Think twice before adding "--nul" synonym to this */ /* Think twice before adding "--nul" synonym to this */
OPT_SET_INT('z', NULL, &state.line_termination, OPT_SET_INT('z', NULL, &state.line_termination,
@ -4679,7 +4676,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
} }
if (state.apply_with_reject) if (state.apply_with_reject)
apply = state.apply_verbosely = 1; apply = state.apply_verbosely = 1;
if (!force_apply && (state.diffstat || state.numstat || state.summary || state.check || fake_ancestor)) if (!force_apply && (state.diffstat || state.numstat || state.summary || state.check || state.fake_ancestor))
apply = 0; apply = 0;
if (state.check_index && is_not_gitdir) if (state.check_index && is_not_gitdir)
die(_("--index outside a repository")); die(_("--index outside a repository"));