Fix for literal pattern containing slash

Fixes ggreer#367

src/ignore.c

@@ -70,6 +70,8 @@ void cleanup_ignore(ignores *ig) {
 void add_ignore_pattern(ignores *ig, const char *pattern) {
     int i;
     int pattern_len;
+    char *tmp_pattern;
+    int tmp_pattern_len;
 
     /* Strip off the leading dot so that matches are more likely. */
     if (strncmp(pattern, "./", 2) == 0) {
@@ -104,14 +106,25 @@ void add_ignore_pattern(ignores *ig, const char *pattern) {
         /* a balanced binary tree is best for performance, but I'm lazy */
         ig->names_len++;
         ig->names = ag_realloc(ig->names, ig->names_len * sizeof(char *));
+
+        /* Prepend '/' if the pattern contains '/' but doesn't start with '/' */
+        if ((pattern[0] != '/') && (strchr(pattern, '/') != NULL)) {
+            ag_asprintf(&tmp_pattern, "/%s", pattern);
+            tmp_pattern_len = pattern_len + 1;
+        } else {
+            tmp_pattern = ag_strndup(pattern, pattern_len);
+            tmp_pattern_len = pattern_len;
+        }
+
         for (i = ig->names_len - 1; i > 0; i--) {
-            if (strcmp(pattern, ig->names[i - 1]) > 0) {
+            if (strcmp(tmp_pattern, ig->names[i - 1]) > 0) {
                 break;
             }
             ig->names[i] = ig->names[i - 1];
         }
-        ig->names[i] = ag_strndup(pattern, pattern_len);
-        log_debug("added literal ignore pattern %s", pattern);
+        ig->names[i] = ag_strndup(tmp_pattern, tmp_pattern_len);
+        log_debug("added literal ignore pattern %s", tmp_pattern);
+        free(tmp_pattern);
     }
 }
 

tests/contain_slash.t

@@ -0,0 +1,23 @@
+Setup:
+
+  $ . $TESTDIR/setup.sh
+  $ mkdir -p ./a/b/c ./d/e/f ./g/a/b ./h/d/e
+  $ echo 'whatever1' > ./a/b/c/foo.yml
+  $ echo 'whatever2' > ./d/e/f/foo.yml
+  $ echo 'whatever3' > ./g/a/b/foo.yml
+  $ echo 'whatever4' > ./h/d/e/foo.yml
+  $ echo 'a/b\n/d/e' > ./.gitignore
+
+Ignore files in ./a/b or ./d/e
+
+  $ ag whatever . | sort
+  g/a/b/foo.yml:1:whatever3
+  h/d/e/foo.yml:1:whatever4
+
+Dont ignore anything (unrestricted search):
+
+  $ ag -u whatever . | sort
+  a/b/c/foo.yml:1:whatever1
+  d/e/f/foo.yml:1:whatever2
+  g/a/b/foo.yml:1:whatever3
+  h/d/e/foo.yml:1:whatever4