diff options
| author | Christian Couder <christian.couder@gmail.com> | 2016-09-04 22:18:21 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-09-07 12:29:53 -0700 |
| commit | 803bf4e012687d92f4c136febe0881852738d57d (patch) | |
| tree | 0a52ae99e231b739d9cf2b19e21f996dd30cd2bb /apply.h | |
| parent | da8e30dcd96f75eac9a343f973198242b44a1ca9 (diff) | |
| download | git-803bf4e012687d92f4c136febe0881852738d57d.tar.gz | |
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 <sbeller@google.com>
Signed-off-by: Christian Couder <chriscool@tuxfamily.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'apply.h')
| -rw-r--r-- | apply.h | 7 |
1 files changed, 7 insertions, 0 deletions
@@ -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 */ + #endif |