From fc4263ce4b6a613622dbe985a8e6aca015789cf1 Mon Sep 17 00:00:00 2001
From: Linus Torvalds <torvalds@ppc970.osdl.org>
Date: Sun, 19 Jun 2005 20:15:22 -0700
Subject: Avoid gcc warning in diff-stages.c

Put explicit parentheses around && in ||-expression.

diff --git a/diff-stages.c b/diff-stages.c
index f099814..9d8cc73 100644
--- a/diff-stages.c
+++ b/diff-stages.c
@@ -107,7 +107,7 @@ int main(int ac, const char **av)
 	    ! (0 <= stage1 && stage1 <= 3) ||
 	    sscanf(av[2], "%d", &stage2) != 1 ||
 	    ! (0 <= stage2 && stage2 <= 3) ||
-	    find_copies_harder && detect_rename != DIFF_DETECT_COPY)
+	    (find_copies_harder && detect_rename != DIFF_DETECT_COPY))
 		usage(diff_stages_usage);
 
 	av += 3; /* The rest from av[0] are for paths restriction. */
-- 
cgit v0.10.2-6-g49f6