aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:54 -0700
committerJunio C Hamano <gitster@pobox.com>2013-03-25 14:00:54 -0700
commitedb99f95f54e9aea8ff4a93a6609a290e0871161 (patch)
tree9dbf64199e1d0f5ef0089ad861d7faceef990ef2
parent9b12c6ed77ace7c7006afb14b66aed79bcd1ed38 (diff)
parent3ce3ffb840a1dfa7fcbafa9309fab37478605d08 (diff)
downloadgit-edb99f95f54e9aea8ff4a93a6609a290e0871161.tar.gz
git-edb99f95f54e9aea8ff4a93a6609a290e0871161.tar.xz
Merge branch 'jk/suppress-clang-warning'
* jk/suppress-clang-warning: fix clang -Wtautological-compare with unsigned enum
-rw-r--r--grep.c3
-rw-r--r--grep.h3
2 files changed, 4 insertions, 2 deletions
diff --git a/grep.c b/grep.c
index 4bd1b8b1d..bb548cae6 100644
--- a/grep.c
+++ b/grep.c
@@ -625,7 +625,8 @@ static struct grep_expr *prep_header_patterns(struct grep_opt *opt)
for (p = opt->header_list; p; p = p->next) {
if (p->token != GREP_PATTERN_HEAD)
die("bug: a non-header pattern in grep header list.");
- if (p->field < 0 || GREP_HEADER_FIELD_MAX <= p->field)
+ if (p->field < GREP_HEADER_FIELD_MIN ||
+ GREP_HEADER_FIELD_MAX <= p->field)
die("bug: unknown header field %d", p->field);
compile_regexp(p, opt);
}
diff --git a/grep.h b/grep.h
index 8fc854f40..e4a1df56a 100644
--- a/grep.h
+++ b/grep.h
@@ -28,7 +28,8 @@ enum grep_context {
};
enum grep_header_field {
- GREP_HEADER_AUTHOR = 0,
+ GREP_HEADER_FIELD_MIN = 0,
+ GREP_HEADER_AUTHOR = GREP_HEADER_FIELD_MIN,
GREP_HEADER_COMMITTER,
GREP_HEADER_REFLOG,