Signed-off-by: Christian Couder <[email protected]>
---
apply.c | 29 +++++++++++++++++++++++++++++
apply.h | 2 +-
builtin/apply.c | 29 -----------------------------
3 files changed, 30 insertions(+), 30 deletions(-)
diff --git a/apply.c b/apply.c
index 11bec48..b29cc64 100644
--- a/apply.c
+++ b/apply.c
@@ -79,3 +79,32 @@ int init_apply_state(struct apply_state *state, const char
*prefix)
return 0;
}
+int check_apply_state(struct apply_state *state, int force_apply)
+{
+ int is_not_gitdir = !startup_info->have_repository;
+
+ if (state->apply_with_reject && state->threeway)
+ return error("--reject and --3way cannot be used together.");
+ if (state->cached && state->threeway)
+ return error("--cached and --3way cannot be used together.");
+ if (state->threeway) {
+ if (is_not_gitdir)
+ return error(_("--3way outside a repository"));
+ state->check_index = 1;
+ }
+ if (state->apply_with_reject)
+ state->apply = state->apply_verbosely = 1;
+ if (!force_apply && (state->diffstat || state->numstat ||
state->summary || state->check || state->fake_ancestor))
+ state->apply = 0;
+ if (state->check_index && is_not_gitdir)
+ return error(_("--index outside a repository"));
+ if (state->cached) {
+ if (is_not_gitdir)
+ return error(_("--cached outside a repository"));
+ state->check_index = 1;
+ }
+ if (state->check_index)
+ state->unsafe_paths = 0;
+ return 0;
+}
+
diff --git a/apply.h b/apply.h
index 021e9e3..35d4d15 100644
--- a/apply.h
+++ b/apply.h
@@ -127,6 +127,6 @@ extern int parse_ignorewhitespace_option(struct apply_state
*state,
const char *option);
extern int init_apply_state(struct apply_state *state, const char *prefix);
-
+extern int check_apply_state(struct apply_state *state, int force_apply);
#endif
diff --git a/builtin/apply.c b/builtin/apply.c
index 7576ec5..eab5ae1 100644
--- a/builtin/apply.c
+++ b/builtin/apply.c
@@ -4534,35 +4534,6 @@ static int option_parse_directory(const struct option
*opt,
return 0;
}
-static int check_apply_state(struct apply_state *state, int force_apply)
-{
- int is_not_gitdir = !startup_info->have_repository;
-
- if (state->apply_with_reject && state->threeway)
- return error("--reject and --3way cannot be used together.");
- if (state->cached && state->threeway)
- return error("--cached and --3way cannot be used together.");
- if (state->threeway) {
- if (is_not_gitdir)
- return error(_("--3way outside a repository"));
- state->check_index = 1;
- }
- if (state->apply_with_reject)
- state->apply = state->apply_verbosely = 1;
- if (!force_apply && (state->diffstat || state->numstat ||
state->summary || state->check || state->fake_ancestor))
- state->apply = 0;
- if (state->check_index && is_not_gitdir)
- return error(_("--index outside a repository"));
- if (state->cached) {
- if (is_not_gitdir)
- return error(_("--cached outside a repository"));
- state->check_index = 1;
- }
- if (state->check_index)
- state->unsafe_paths = 0;
- return 0;
-}
-
static int apply_all_patches(struct apply_state *state,
int argc,
const char **argv,
--
2.8.1.300.g5fed0c0
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
