Merge branch 'fg/maint-exclude-bq' into maint

gitster · gitster · commit 5f7b3383106d · 2009-03-11T13:53:53.000-07:00
* fg/maint-exclude-bq:
  Support "\" in non-wildcard exclusion entries
diff --git a/dir.c b/dir.c
@@ -137,7 +137,7 @@ int match_pathspec(const char **pathspec, const char *name, int namelen,
 
 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,
diff --git a/t/t3001-ls-files-others-exclude.sh b/t/t3001-ls-files-others-exclude.sh
@@ -19,6 +19,9 @@ do
     >$dir/a.$i
   done
 done
+>"#ignore1"
+>"#ignore2"
+>"#hidden"
 
 cat >expect <<EOF
 a.2
@@ -42,6 +45,9 @@ three/a.8
 EOF
 
 echo '.gitignore
+\#ignore1
+\#ignore2*
+\#hid*n
 output
 expect
 .gitignore
@@ -79,9 +85,10 @@ test_expect_success \
        >output &&
      test_cmp expect output'
 
-cat > excludes-file << EOF
+cat > excludes-file <<\EOF
 *.[1-8]
 e*
+\#*
 EOF
 
 git config core.excludesFile excludes-file

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ int match_pathspec(const char *pathspec, const char name, int namelen,`
`137`	`137`
`138`	`138`	`static int no_wildcard(const char *string)`
`139`	`139`	`{`
`140`		`- return string[strcspn(string, "*?[{")] == '\0';`
	`140`	`+ return string[strcspn(string, "*?[{\\")] == '\0';`
`141`	`141`	`}`
`142`	`142`
`143`	`143`	`void add_exclude(const char string, const char base,`