src/ignore.c

@@ -206,6 +206,7 @@ static int ackmate_dir_match(const char *dir_name) { /* This is the hottest code in Ag. 10-15% of all execution time is spent here */ static int path_ignore_search(const ignores *ig, const char *path, const char *filename) {     char *temp;+    int temp_start_pos;     size_t i;     int match_pos; @@ -216,9 +217,12 @@ static int path_ignore_search(const ignores *ig, const char *path, const char *f     }      ag_asprintf(&temp, "%s/%s", path[0] == '.' ? path + 1 : path, filename);+    //ig->abs_path has its leading slash stripped, so we have to strip the leading slash+    //of temp as well+    temp_start_pos = (temp[0] == '/') ? 1 : 0; -    if (strncmp(temp, ig->abs_path, ig->abs_path_len) == 0) {-        char *slash_filename = temp + ig->abs_path_len;+    if (strncmp(temp+temp_start_pos, ig->abs_path, ig->abs_path_len) == 0) {+        char *slash_filename = temp + temp_start_pos + ig->abs_path_len;         if (slash_filename[0] == '/') {             slash_filename++;         }

tests/ignore_slash_in_subdir.t

new file mode 100644@@ -0,0 +1,19 @@+Setup:++  $ . $TESTDIR/setup.sh+  $ mkdir -p subdir/ignoredir+  $ mkdir ignoredir+  $ printf 'match1\n' > subdir/ignoredir/file1.txt+  $ printf 'match1\n' > ignoredir/file1.txt+  $ printf '/ignoredir\n' > subdir/.ignore++Ignore file in subdir/ignoredir, but not in ignoredir:++  $ ag match+  ignoredir/file1.txt:1:match1++From subdir, ignore file in subdir/ignoredir:++  $ cd subdir+  $ ag match+  [1]