From 872a1076586781b522c75792d544b9a4f4a7d082 Mon Sep 17 00:00:00 2001
From: Andrew Gallant <jamslam@gmail.com>
Date: Sat, 24 Sep 2016 20:09:29 -0400
Subject: [PATCH] Fix whitelisting precedence.

Once a file is known to be whitelisted, we shouldn't check any ancestor
gitignores.
---
 src/ignore.rs | 34 ++++++++++++++++++++++------------
 1 file changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/ignore.rs b/src/ignore.rs
index 7b70035..7dae9fa 100644
--- a/src/ignore.rs
+++ b/src/ignore.rs
@@ -217,30 +217,40 @@ impl Ignore {
             return true;
         }
         if !self.no_ignore {
+            let mut whitelisted = false;
             for id in self.stack.iter().rev() {
                 let mat = id.matched(path, is_dir);
+                // println!("path: {}, mat: {:?}, id: {:?}",
+                         // path.display(), mat, id);
                 if let Some(is_ignored) = self.ignore_match(path, mat) {
                     if is_ignored {
                         return true;
                     }
                     // If this path is whitelisted by an ignore, then
                     // fallthrough and let the file type matcher have a say.
+                    whitelisted = true;
                     break;
                 }
             }
-            let mut path = path.to_path_buf();
-            for id in self.parent_stack.iter().rev() {
-                if let Some(ref dirname) = id.name {
-                    path = Path::new(dirname).join(path);
-                }
-                let mat = id.matched(&*path, is_dir);
-                if let Some(is_ignored) = self.ignore_match(&*path, mat) {
-                    if is_ignored {
-                        return true;
+            // If the file has been whitelisted, then we have to stop checking
+            // parent directories. The only thing that can override a whitelist
+            // at this point is a type filter.
+            if !whitelisted {
+                let mut path = path.to_path_buf();
+                for id in self.parent_stack.iter().rev() {
+                    if let Some(ref dirname) = id.name {
+                        path = Path::new(dirname).join(path);
+                    }
+                    let mat = id.matched(&*path, is_dir);
+                    if let Some(is_ignored) = self.ignore_match(&*path, mat) {
+                        if is_ignored {
+                            return true;
+                        }
+                        // If this path is whitelisted by an ignore, then
+                        // fallthrough and let the file type matcher have a
+                        // say.
+                        break;
                     }
-                    // If this path is whitelisted by an ignore, then
-                    // fallthrough and let the file type matcher have a say.
-                    break;
                 }
             }
         }