Merge branch 'nested-submodules' into 'master'

Fix nested submodules

Make the `Repository#submodules` method work with submodules that are nested beneath the repo's root directory.  This patch uses the existing `#tree_entry` method to recurse through the commit tree as an alternative to the patch in #6.

Fixes [issue 8135](https://github.com/gitlabhq/gitlabhq/issues/8135) on github.

/cc @jacobvosmaer @dzaporozhets

See merge request !9

Author: jacobvosmaer

lib/gitlab_git/repository.rb

@@ -412,10 +412,10 @@ def lookup(oid_or_ref_name)
       #   }
       #
       def submodules(ref)
-        tree = rugged.lookup(rugged.rev_parse_oid(ref)).tree
+        commit = rugged.rev_parse(ref)
 
-        content = blob_content(tree, ".gitmodules")
-        parse_gitmodules(tree, content)
+        content = blob_content(commit, ".gitmodules")
+        parse_gitmodules(commit, content)
       end
 
       # Return total commits count accessible from passed ref
@@ -717,21 +717,21 @@ def rev_parse_target(revspec)
         end
       end
 
-      # Get the content of a blob for a given tree.  If the blob is a commit
+      # Get the content of a blob for a given commit.  If the blob is a commit
       # (for submodules) then return the blob's OID.
-      def blob_content(tree, blob_name)
-        blob_hash = tree.detect { |b| b[:name] == blob_name }
+      def blob_content(commit, blob_name)
+        blob_entry = tree_entry(commit, blob_name)
 
-        if blob_hash[:type] == :commit
-          blob_hash[:oid]
+        if blob_entry[:type] == :commit
+          blob_entry[:oid]
         else
-          rugged.lookup(blob_hash[:oid]).content
+          rugged.lookup(blob_entry[:oid]).content
         end
       end
 
       # Parses the contents of a .gitmodules file and returns a hash of
       # submodule information.
-      def parse_gitmodules(tree, content)
+      def parse_gitmodules(commit, content)
         results = {}
 
         current = ""
@@ -744,7 +744,7 @@ def parse_gitmodules(tree, content)
             results[current][match_data[1]] = match_data[2]
 
             if match_data[1] == "path"
-              results[current]["id"] = blob_content(tree, match_data[2])
+              results[current]["id"] = blob_content(commit, match_data[2])
             end
           end
         end

spec/repository_spec.rb

@@ -160,7 +160,7 @@
 
   context :submodules do
     let(:repository) { Gitlab::Git::Repository.new(TEST_REPO_PATH) }
-    let(:submodules) { repository.submodules(SeedRepo::Commit::ID) }
+    let(:submodules) { repository.submodules('master') }
 
     it { submodules.should be_kind_of Hash }
     it { submodules.empty?.should be_false }
@@ -177,6 +177,20 @@
           }
         ]
       end
+
+      it 'should handle nested submodules correctly' do
+        nested = submodules['nested/six']
+        expect(nested['path']).to eq('nested/six')
+        expect(nested['url']).to eq('git://github.com/randx/six.git')
+        expect(nested['id']).to eq('24fb71c79fcabc63dfd8832b12ee3bf2bf06b196')
+      end
+
+      it 'should handle deeply nested submodules correctly' do
+        nested = submodules['deeper/nested/six']
+        expect(nested['path']).to eq('deeper/nested/six')
+        expect(nested['url']).to eq('git://github.com/randx/six.git')
+        expect(nested['id']).to eq('24fb71c79fcabc63dfd8832b12ee3bf2bf06b196')
+      end
     end
   end