Merge lp:~jelmer/brz/keep-submodule into lp:brz

[Jelmer Vernooij]

Don't show a delta for unchanged submodules.

Don't show a delta for unchanged submodules.

[Martin Packman (gz)]

Looks good, thanks!

review: Approve

=== modified file 'breezy/git/tests/test_workingtree.py'
--- breezy/git/tests/test_workingtree.py	2018-09-30 00:33:53 +0000
+++ breezy/git/tests/test_workingtree.py	2018-11-12 20:29:12 +0000
@@ -22,7 +22,9 @@
 import os
 import stat
 
+from dulwich.index import IndexEntry
 from dulwich.objects import (
+    S_IFGITLINK,
     Blob,
     Tree,
     ZERO_SHA,
@@ -130,17 +132,19 @@
     def setUp(self):
         super(ChangesBetweenGitTreeAndWorkingCopyTests, self).setUp()
         self.wt = self.make_branch_and_tree('.', format='git')
+        self.store = self.wt.branch.repository._git.object_store
 
     def expectDelta(self, expected_changes,
-                    expected_extras=None, want_unversioned=False):
-        store = self.wt.branch.repository._git.object_store
-        try:
-            tree_id = store[self.wt.branch.repository._git.head()].tree
-        except KeyError:
-            tree_id = None
+                    expected_extras=None, want_unversioned=False,
+                    tree_id=None):
+        if tree_id is None:
+            try:
+                tree_id = self.store[self.wt.branch.repository._git.head()].tree
+            except KeyError:
+                tree_id = None
         with self.wt.lock_read():
             changes, extras = changes_between_git_tree_and_working_copy(
-                store, tree_id, self.wt, want_unversioned=want_unversioned)
+                self.store, tree_id, self.wt, want_unversioned=want_unversioned)
             self.assertEqual(expected_changes, list(changes))
         if expected_extras is None:
             expected_extras = set()
@@ -236,3 +240,16 @@
             (None, newt.id)),
             ((None, b'a'), (None, stat.S_IFREG | 0o644), (None, newa.id))
             ], [b'a'], want_unversioned=True)
+
+    def test_submodule(self):
+        self.build_tree(['a/'])
+        a = Blob.from_string(b'irrelevant\n')
+        with self.wt.lock_tree_write():
+            (index, index_path) = self.wt._lookup_index(b'a')
+            index[b'a'] = IndexEntry(
+                    0, 0, 0, 0, S_IFGITLINK, 0, 0, 0, a.id, 0)
+            self.wt._index_dirty = True
+        t = Tree()
+        t.add(b"a", S_IFGITLINK , a.id)
+        self.store.add_object(t)
+        self.expectDelta([], tree_id=t.id)

=== modified file 'breezy/git/tree.py'
--- breezy/git/tree.py	2018-09-14 16:53:25 +0000
+++ breezy/git/tree.py	2018-11-12 20:29:12 +0000
@@ -1408,9 +1408,13 @@
                 # Entry was removed; keep it listed, but mark it as gone.
                 blobs[path] = (ZERO_SHA, 0)
             elif e.errno == errno.EISDIR:
-                # Entry was turned into a directory
-                dirified.append((path, Tree().id, stat.S_IFDIR))
-                store.add_object(Tree())
+                # TODO(jelmer): Only do this if 'path' appears in .gitmodules?
+                if S_ISGITLINK(index_entry.mode):
+                    blobs[path] = (index_entry.sha, index_entry.mode)
+                else:
+                    # Entry was turned into a directory
+                    dirified.append((path, Tree().id, stat.S_IFDIR))
+                    store.add_object(Tree())
             else:
                 raise
         else: