From: Javier Villavicencio <the_paya@gentoo.org>
Date: Sun, 28 Mar 2010 18:42:01 +0000 (+0200)
Subject: exclude: fix the case of globs vs. EXCLUDE_INCLUDE
X-Git-Tag: v0.1~4401
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=6207255863f1fb5172ead8b03cda5e4b0b7336a4;p=gnulib.git

exclude: fix the case of globs vs. EXCLUDE_INCLUDE

* lib/exclude.c (excluded_file_pattern_p): Fix logic error that
made it so grep -r --include=GLOB* ... did not work.
---

diff --git a/ChangeLog b/ChangeLog
index 12e072206..86403b2ad 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-03-28  Javier Villavicencio  <the_paya@gentoo.org>
+
+	exclude: fix the case of globs vs. EXCLUDE_INCLUDE
+	* lib/exclude.c (excluded_file_pattern_p): Fix logic error that
+	made it so grep -r --include=GLOB* ... did not work.
+
 2010-03-26  Jim Meyering  <meyering@redhat.com>
 	    Eric Blake  <eblake@redhat.com>
 
diff --git a/lib/exclude.c b/lib/exclude.c
index d4dcd76bd..34b563671 100644
--- a/lib/exclude.c
+++ b/lib/exclude.c
@@ -342,7 +342,7 @@ excluded_file_pattern_p (struct exclude_segment const *seg, char const *f)
     {
       char const *pattern = exclude[i].pattern;
       int options = exclude[i].options;
-      if (excluded != exclude_fnmatch (pattern, f, options))
+      if (exclude_fnmatch (pattern, f, options))
         return !excluded;
     }
   return excluded;