path: root/apply.h
diff options
authorChristian Couder <>2016-09-04 20:18:21 (GMT)
committerJunio C Hamano <>2016-09-07 19:29:53 (GMT)
commit803bf4e012687d92f4c136febe0881852738d57d (patch)
tree0a52ae99e231b739d9cf2b19e21f996dd30cd2bb /apply.h
parentda8e30dcd96f75eac9a343f973198242b44a1ca9 (diff)
apply: rename and move opt constants to apply.h
The constants for the "inaccurate-eof" and the "recount" options will be used in both "apply.c" and "builtin/apply.c", so they need to go into "apply.h", and therefore they need a name that is more specific to the API they belong to. Helped-by: Stefan Beller <> Signed-off-by: Christian Couder <> Signed-off-by: Junio C Hamano <>
Diffstat (limited to 'apply.h')
1 files changed, 7 insertions, 0 deletions
diff --git a/apply.h b/apply.h
index 53f09b5..48abd8e 100644
--- a/apply.h
+++ b/apply.h
@@ -108,4 +108,11 @@ extern int init_apply_state(struct apply_state *state,
extern void clear_apply_state(struct apply_state *state);
extern int check_apply_state(struct apply_state *state, int force_apply);
+ * Some aspects of the apply behavior are controlled by the following
+ * bits in the "options" parameter passed to apply_all_patches().
+ */
+#define APPLY_OPT_INACCURATE_EOF (1<<0) /* accept inaccurate eof */
+#define APPLY_OPT_RECOUNT (1<<1) /* accept inaccurate line count */