Only ignore manifest.yml at the app root directory

[Finishes #70044992]
cloudfoundry · Apr 23, 2014 · 875645c · 875645c
1 parent 331861f
commit 875645c
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/src/cf/app_files/cf_ignore.go b/src/cf/app_files/cf_ignore.go
@@ -74,7 +74,7 @@ type cfIgnore []ignorePattern
 
 var defaultIgnoreLines = []string{
 	".cfignore",
-	"manifest.yml",
+	"/manifest.yml",
 	".gitignore",
 	".git",
 	".hg",

diff --git a/src/cf/app_files/cf_ignore_test.go b/src/cf/app_files/cf_ignore_test.go
@@ -58,4 +58,22 @@ stuff/exclude.c`)
 		ignore = NewCfIgnore(`!.git`)
 		Expect(ignore.FileShouldBeIgnored(".git/objects")).To(BeFalse())
 	})
+
+	Describe("files named manifest.yml", func() {
+		var (
+			ignore CfIgnore
+		)
+
+		BeforeEach(func() {
+			ignore = NewCfIgnore("")
+		})
+
+		It("ignores manifest.yml at the top level", func() {
+			Expect(ignore.FileShouldBeIgnored("manifest.yml")).To(BeTrue())
+		})
+
+		It("does not ignore nested manifest.yml files", func() {
+			Expect(ignore.FileShouldBeIgnored("public/assets/manifest.yml")).To(BeFalse())
+		})
+	})
 })