/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to breezy/git/workingtree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-20 22:51:03 UTC
  • mfrom: (7199.4.1 git-ignore)
  • Revision ID: breezy.the.bot@gmail.com-20181120225103-797eeqny66nf9tcd
Fix 'brz ignore' in git working trees.

Merged from https://code.launchpad.net/~jelmer/brz/git-ignore/+merge/359009

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
83
83
    mode_kind,
84
84
    )
85
85
 
86
 
IGNORE_FILENAME = ".gitignore"
87
 
 
88
86
 
89
87
class GitWorkingTree(MutableGitIndexTree, workingtree.WorkingTree):
90
88
    """A Git working tree."""
1348
1346
 
1349
1347
    supports_merge_modified = False
1350
1348
 
 
1349
    ignore_filename = ".gitignore"
 
1350
 
1351
1351
    @property
1352
1352
    def _matchingcontroldir(self):
1353
1353
        from .dir import LocalGitControlDirFormat