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

apply.c: make init_apply_state() take a struct repository

Browse Source 
We're moving away from the_index in this code. "struct index_state *"
could be added to struct apply_state. But let's aim long term and put
struct repository here instead so that we could even avoid more global
states in the future. The index will be available via
apply_state->repo->index.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Nguyễn Thái Ngọc Duy 2018-08-13 18:14:39 +02:00 committed by Junio C Hamano
parent 332a82a522
commit 82ea77eca7
4 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apply.c
View File

@ -76,10 +76,12 @@ static int parse_ignorewhitespace_option(struct apply_state *state,
} }
int init_apply_state(struct apply_state *state, int init_apply_state(struct apply_state *state,
struct repository *repo,
const char *prefix) const char *prefix)
{ {
memset(state, 0, sizeof(*state)); memset(state, 0, sizeof(*state));
state->prefix = prefix; state->prefix = prefix;
state->repo = repo;
state->apply = 1; state->apply = 1;
state->line_termination = '\n'; state->line_termination = '\n';
state->p_value = 1; state->p_value = 1;

4
apply.h
View File

@ -1,6 +1,8 @@
#ifndef APPLY_H #ifndef APPLY_H
#define APPLY_H #define APPLY_H
struct repository;
enum apply_ws_error_action { enum apply_ws_error_action {
nowarn_ws_error, nowarn_ws_error,
warn_on_ws_error, warn_on_ws_error,
@ -62,6 +64,7 @@ struct apply_state {
int unsafe_paths; int unsafe_paths;
/* Other non boolean parameters */ /* Other non boolean parameters */
struct repository *repo;
const char *index_file; const char *index_file;
enum apply_verbosity apply_verbosity; enum apply_verbosity apply_verbosity;
const char *fake_ancestor; const char *fake_ancestor;
@ -116,6 +119,7 @@ int apply_parse_options(int argc, const char **argv,
int *force_apply, int *options, int *force_apply, int *options,
const char * const *apply_usage); const char * const *apply_usage);
int init_apply_state(struct apply_state *state, int init_apply_state(struct apply_state *state,
struct repository *repo,
const char *prefix); const char *prefix);
void clear_apply_state(struct apply_state *state); void clear_apply_state(struct apply_state *state);
int check_apply_state(struct apply_state *state, int force_apply); int check_apply_state(struct apply_state *state, int force_apply);

2
builtin/am.c
View File

@ -1464,7 +1464,7 @@ static int run_apply(const struct am_state *state, const char *index_file)
int force_apply = 0; int force_apply = 0;
int options = 0; int options = 0;
if (init_apply_state(&apply_state, NULL)) if (init_apply_state(&apply_state, the_repository, NULL))
BUG("init_apply_state() failed"); BUG("init_apply_state() failed");
argv_array_push(&apply_opts, "apply"); argv_array_push(&apply_opts, "apply");

2
builtin/apply.c
View File

@ -16,7 +16,7 @@ int cmd_apply(int argc, const char **argv, const char *prefix)
int ret; int ret;
struct apply_state state; struct apply_state state;
if (init_apply_state(&state, prefix)) if (init_apply_state(&state, the_repository, prefix))
exit(128); exit(128);
argc = apply_parse_options(argc, argv, argc = apply_parse_options(argc, argv,