diff options
| author | Stefan Beller <sbeller@google.com> | 2018-01-04 22:50:40 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-01-04 23:02:40 (GMT) |
| commit | c1ddc4610c553b06591aac74b610b56448cbb976 (patch) | |
| tree | 48fe627819dbb33b40ecefcf5d2a66d4d041ba08 /diff.h | |
| parent | 929ed70a7263fc3be909b363993672b649153706 (diff) | |
| download | git-c1ddc4610c553b06591aac74b610b56448cbb976.zip git-c1ddc4610c553b06591aac74b610b56448cbb976.tar.gz git-c1ddc4610c553b06591aac74b610b56448cbb976.tar.bz2 | |
diff: migrate diff_flags.pickaxe_ignore_case to a pickaxe_opts bit
Currently flags for pickaxing are found in different places. Unify the
flags into the `pickaxe_opts` field, which will contain any pickaxe related
flags.
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'diff.h')
| -rw-r--r-- | diff.h | 3 |
1 files changed, 2 insertions, 1 deletions
@@ -91,7 +91,6 @@ struct diff_flags { unsigned override_submodule_config:1; unsigned dirstat_by_line:1; unsigned funccontext:1; - unsigned pickaxe_ignore_case:1; unsigned default_follow_renames:1; }; @@ -327,6 +326,8 @@ extern void diff_setup_done(struct diff_options *); #define DIFF_PICKAXE_KIND_S 4 /* traditional plumbing counter */ #define DIFF_PICKAXE_KIND_G 8 /* grep in the patch */ +#define DIFF_PICKAXE_IGNORE_CASE 32 + extern void diffcore_std(struct diff_options *); extern void diffcore_fix_diff_index(struct diff_options *); |