/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/tree.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-11-16 22:18:20 UTC
  • mfrom: (7131.13.3 keep-submodule)
  • Revision ID: breezy.the.bot@gmail.com-20181116221820-rjnlcuk6z1n16eo5
Don't show a delta for unchanged submodules.

Merged from https://code.launchpad.net/~jelmer/brz/keep-submodule/+merge/355820

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tree.py
1446
1446
                # Entry was removed; keep it listed, but mark it as gone.
1447
1447
                blobs[path] = (ZERO_SHA, 0)
1448
1448
            elif e.errno == errno.EISDIR:
1449
 
                # Entry was turned into a directory
1450
 
                dirified.append((path, Tree().id, stat.S_IFDIR))
1451
 
                store.add_object(Tree())
 
1449
                # TODO(jelmer): Only do this if 'path' appears in .gitmodules?
 
1450
                if S_ISGITLINK(index_entry.mode):
 
1451
                    blobs[path] = (index_entry.sha, index_entry.mode)
 
1452
                else:
 
1453
                    # Entry was turned into a directory
 
1454
                    dirified.append((path, Tree().id, stat.S_IFDIR))
 
1455
                    store.add_object(Tree())
1452
1456
            else:
1453
1457
                raise
1454
1458
        else: