Merge branch 'maint-1.6.0' into maint-1.6.1

diff --git a/dir.c b/dir.c
index 0131983dfbc143ce5dae77e067663bb2e7d5f126..2c18e417d16801cbca38ab1e7b8b5f8615f1e45d 100644 (file)
--- a/dir.c
+++ b/dir.c
@@ -134,7 +134,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen, int pre
 
 static int no_wildcard(const char *string)
 {
-       return string[strcspn(string, "*?[{")] == '\0';
+       return string[strcspn(string, "*?[{\\")] == '\0';
 }
 
 void add_exclude(const char *string, const char *base,