Merge ce8391814f into bb19aea597

pkg/ignore/rules.go

@@ -46,7 +46,8 @@ func Empty() *Rules {
 //
 // Ignore all dotfiles in "templates/"
 func (r *Rules) AddDefaults() {
-	r.parseRule(`templates/.?*`)
+	// Placeholder for default rules with sample of ignoring dotfiles
+	// r.parseRule(`templates/.?*`)
 }
 
 // ParseFile parses a helmignore file and returns the *Rules.

pkg/ignore/rules_test.go

@@ -98,7 +98,8 @@ func TestIgnore(t *testing.T) {
 		{`cargo/*.*`, "cargo/a.txt", true},
 		{`cargo/*.txt`, "mast/a.txt", false},
 		{`ru[c-e]?er.txt`, "rudder.txt", true},
-		{`templates/.?*`, "templates/.dotfile", true},
+		// ".?*" should not get ignored. https://github.com/kubernetes/helm/issues/4058
+		{`templates/.?*`, "templates/.dotfile", false},
 		// "." should never get ignored. https://github.com/kubernetes/helm/issues/1776
 		{`.*`, ".", false},
 		{`.*`, "./", false},
@@ -144,8 +145,8 @@ func TestAddDefaults(t *testing.T) {
 	r := Rules{}
 	r.AddDefaults()
 
-	if len(r.patterns) != 1 {
-		t.Errorf("Expected 1 default patterns, got %d", len(r.patterns))
+	if len(r.patterns) != 0 {
+		t.Errorf("Expected 0 default patterns, got %d", len(r.patterns))
 	}
 }