summaryrefslogtreecommitdiff
path: root/diff.h
diff options
context:
space:
mode:
authorLibravatar Stefan Beller <sbeller@google.com>2018-01-04 14:50:39 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-01-04 15:02:40 -0800
commit929ed70a7263fc3be909b363993672b649153706 (patch)
tree1e69e2293e5fa2d12b1daac603d51012787334b1 /diff.h
parentMerge branch 'jm/status-ignored-files-list' (diff)
downloadtgif-929ed70a7263fc3be909b363993672b649153706.tar.xz
diff.h: make pickaxe_opts an unsigned bit field
This variable is used as a bit field[1], and as we are about to add more fields, indicate its usage as a bit field by making it unsigned. [1] containing the bits #define DIFF_PICKAXE_ALL 1 #define DIFF_PICKAXE_REGEX 2 #define DIFF_PICKAXE_KIND_S 4 #define DIFF_PICKAXE_KIND_G 8 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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/diff.h b/diff.h
index 0fb18dd735..ea310f76fd 100644
--- a/diff.h
+++ b/diff.h
@@ -146,7 +146,7 @@ struct diff_options {
int skip_stat_unmatch;
int line_termination;
int output_format;
- int pickaxe_opts;
+ unsigned pickaxe_opts;
int rename_score;
int rename_limit;
int needed_rename_limit;