Merge pull request #61 from CocoaPods/seg-fix-commit-with-submodules

[Git] Fix checking out a commit with submodules

CHANGELOG.md

@@ -8,7 +8,9 @@
 
 ##### Bug Fixes
 
-* None.  
+* Ensure submodules are updated after checking out a specific git commit.  
+  [Samuel Giddins](https://github.com/segiddins)
+  [CocoaPods#5778](https://github.com/CocoaPods/CocoaPods/issues/5778)
 
 
 ## 1.1.0 (2016-07-11)

lib/cocoapods-downloader/git.rb

@@ -79,12 +79,7 @@ def clone(force_head = false, shallow_clone = true)
         ui_sub_action('Git download') do
           begin
             git! clone_arguments(force_head, shallow_clone)
-
-            if options[:submodules]
-              Dir.chdir(target_path) do
-                git! %w(submodule update --init --recursive)
-              end
-            end
+            update_submodules
           rescue DownloaderError => e
             if e.message =~ /^fatal:.*does not support --depth$/im
               clone(force_head, false)
@@ -95,6 +90,13 @@ def clone(force_head = false, shallow_clone = true)
         end
       end
 
+      def update_submodules
+        return unless options[:submodules]
+        Dir.chdir(target_path) do
+          git! %w(submodule update --init --recursive)
+        end
+      end
+
       # The arguments to pass to `git` to clone the repo.
       #
       # @param  [Bool] force_head
@@ -128,6 +130,7 @@ def clone_arguments(force_head, shallow_clone)
       def checkout_commit
         Dir.chdir(target_path) do
           git! 'checkout', '--quiet', options[:commit]
+          update_submodules
         end
       end
     end