summaryrefslogtreecommitdiff
path: root/revision.c
diff options
context:
space:
mode:
authorStefan Beller <sbeller@google.com>2018-01-04 22:50:40 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-01-04 23:02:40 (GMT)
commitc1ddc4610c553b06591aac74b610b56448cbb976 (patch)
tree48fe627819dbb33b40ecefcf5d2a66d4d041ba08 /revision.c
parent929ed70a7263fc3be909b363993672b649153706 (diff)
downloadgit-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 'revision.c')
-rw-r--r--revision.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/revision.c b/revision.c
index e2e691d..ccf1d21 100644
--- a/revision.c
+++ b/revision.c
@@ -2076,7 +2076,7 @@ static int handle_revision_opt(struct rev_info *revs, int argc, const char **arg
revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_ERE;
} else if (!strcmp(arg, "--regexp-ignore-case") || !strcmp(arg, "-i")) {
revs->grep_filter.ignore_case = 1;
- revs->diffopt.flags.pickaxe_ignore_case = 1;
+ revs->diffopt.pickaxe_opts |= DIFF_PICKAXE_IGNORE_CASE;
} else if (!strcmp(arg, "--fixed-strings") || !strcmp(arg, "-F")) {
revs->grep_filter.pattern_type_option = GREP_PATTERN_TYPE_FIXED;
} else if (!strcmp(arg, "--perl-regexp") || !strcmp(arg, "-P")) {