/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: Jelmer Vernooij
  • Date: 2019-06-03 23:48:08 UTC
  • mfrom: (7316 work)
  • mto: This revision was merged to the branch mainline in revision 7328.
  • Revision ID: jelmer@jelmer.uk-20190603234808-15yk5c7054tj8e2b
Merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/workingtree.py
568
568
                    except OSError as e:
569
569
                        if e.errno == errno.ENOENT:
570
570
                            raise errors.NoSuchFile(fullpath)
571
 
                    if (kind == 'directory' and f != '' and
572
 
                            os.path.exists(os.path.join(fullpath, '.git'))):
 
571
                    if f != '' and self._directory_is_tree_reference(f):
573
572
                        kind = 'tree-reference'
574
573
                    kinds[pos] = kind
575
574