gitlab_git 7.0.0.rc9 → 7.0.0.rc10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7ec22b2587950203d9032f5751289974e071e31
-  data.tar.gz: fe553f891594bbb3003feb752bebdb6217b28539
+  metadata.gz: 47fb0500cc9f11693684d6b9f27574948da9ef92
+  data.tar.gz: 19dffe313f146a53f799ab8c6de3ce5a1cbed734
 SHA512:
-  metadata.gz: a0f637cfdea87897513107b35aa5166533d6e901ee2b3f8cd27aec7328aa1c4b9d68056ff89e0540aafca89d0d6799042cd9cf26674f71f421f58d49647234fe
-  data.tar.gz: 22b05d255f9d5be02aeb6197e04fe1f9e2243fa2c58120ad4bbac5de39f079731c2980716bb0a16d34a1ac81fbac8ef22ee83fbc80a4e6d2489d2b4a86dba46e
+  metadata.gz: 77646b0c9cc5b1d6f4d218928c9ef143b0caae0eef394c17fe893f032f986efaebc0639c3d94ee9c4faeb39a5fa627b7a10f0db161ccfba2cda658a88bd1ed4b
+  data.tar.gz: fc6fccda0442a3acb885d92d6b924e4f5344bee8cac725c048541d0f296f9acb03f2bfdd04ec26529e4c72f96519b8b31b4ac90842b12b1fbfcda6d63a674331

data/VERSION

@@ -1 +1 @@
-7.0.0.rc9
+7.0.0.rc10

data/lib/gitlab_git/repository.rb

@@ -412,10 +412,10 @@ module Gitlab
       #   }
       #
       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 @@ module Gitlab
         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 @@ module Gitlab
             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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gitlab_git
 version: !ruby/object:Gem::Version
-  version: 7.0.0.rc9
+  version: 7.0.0.rc10
 platform: ruby
 authors:
 - Dmitriy Zaporozhets
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2014-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab-linguist