Merge pull request #365 from rkennedy/bug-ignore-regex2

hemanth · hemanth · commit 6988f4325bc4 · 2015-04-30T11:29:19.000+05:30
Don't treat ignored patterns as regexps
diff --git a/bin/git-ignore b/bin/git-ignore
@@ -32,7 +32,7 @@ function add_patterns {
   local file="${1/#~/$HOME}"
   for pattern in "${@:2}"; do
     echo "... adding '$pattern'"
-    (test -f "$file" && test "$pattern" && grep -q -- "$pattern" "$file") || echo "$pattern" >> "$file"
+    (test -f "$file" && test "$pattern" && grep -q -F -x -- "$pattern" "$file") || echo "$pattern" >> "$file"
   done
 }
 

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ function add_patterns {`
`32`	`32`	`local file="${1/#~/$HOME}"`
`33`	`33`	`for pattern in "${@:2}"; do`
`34`	`34`	`echo "... adding '$pattern'"`
`35`		`- (test -f "$file" && test "$pattern" && grep -q -- "$pattern" "$file") \|\| echo "$pattern" >> "$file"`
	`35`	`+ (test -f "$file" && test "$pattern" && grep -q -F -x -- "$pattern" "$file") \|\| echo "$pattern" >> "$file"`
`36`	`36`	`done`
`37`	`37`	`}`
`38`	`38`