Merge lp:~jelmer/brz/git-ignore into lp:brz

[Jelmer Vernooij]

Fix 'brz ignore' in git working trees.

Fix 'brz ignore' in git working trees.

[Martin Packman (gz)]

Looks good, though 'foo' is a needlessly uncreative test string.

review: Approve

=== modified file 'breezy/git/tests/test_blackbox.py'
--- breezy/git/tests/test_blackbox.py	2018-11-16 23:28:26 +0000
+++ breezy/git/tests/test_blackbox.py	2018-11-19 20:22:41 +0000
@@ -65,6 +65,13 @@
         self.assertEqual(error, '')
         self.assertTrue("Standalone tree (format: git)" in output)
 
+    def test_ignore(self):
+        self.simple_commit()
+        output, error = self.run_bzr(['ignore', 'foo'])
+        self.assertEqual(error, '')
+        self.assertEqual(output, '')
+        self.assertFileEqual("foo\n", ".gitignore")
+
     def test_branch(self):
         os.mkdir("gitbranch")
         GitRepo.init(os.path.join(self.test_dir, "gitbranch"))

=== modified file 'breezy/git/workingtree.py'
--- breezy/git/workingtree.py	2018-11-16 23:21:31 +0000
+++ breezy/git/workingtree.py	2018-11-19 20:22:41 +0000
@@ -83,8 +83,6 @@
     mode_kind,
     )
 
-IGNORE_FILENAME = ".gitignore"
-
 
 class GitWorkingTree(MutableGitIndexTree, workingtree.WorkingTree):
     """A Git working tree."""
@@ -1350,6 +1348,8 @@
 
     supports_merge_modified = False
 
+    ignore_filename = ".gitignore"
+
     @property
     def _matchingcontroldir(self):
         from .dir import LocalGitControlDirFormat