From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 21:00:54 +0000 (-0700)
Subject: Merge branch 'jk/suppress-clang-warning'
X-Git-Tag: v1.8.3-rc0~177
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/edb99f95f54e9aea8ff4a93a6609a290e0871161?hp=9b12c6ed77ace7c7006afb14b66aed79bcd1ed38

Merge branch 'jk/suppress-clang-warning'

* jk/suppress-clang-warning:
fix clang -Wtautological-compare with unsigned enum
---

diff --git a/grep.c b/grep.c
index 4bd1b8b1dd..bb548cae69 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 8fc854f400..e4a1df56a4 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,