Allow checkout options to be used for :head pods

lib/cocoapods/installer/analyzer.rb

@@ -53,6 +53,8 @@ module Pod
         @result.podfile_state = generate_podfile_state
         @locked_dependencies  = generate_version_locking_dependencies
 
+        store_existing_checkout_options
+
         fetch_external_sources if allow_fetches
         @result.specs_by_target = resolve_dependencies
         @result.specifications  = generate_specifications
@@ -335,6 +337,14 @@ module Pod
         end
       end
 
+      def store_existing_checkout_options
+        podfile.dependencies.select { |d| d.external_source || d.head? }.each do |dep|
+          if checkout_options = lockfile && lockfile.checkout_options_for_pod_named(dep.root_name)
+            sandbox.store_checkout_source(dep.root_name, checkout_options)
+          end
+        end
+      end
+
       # Converts the Podfile in a list of specifications grouped by target.
       #
       # @note   As some dependencies might have external sources the resolver

lib/cocoapods/installer/pod_source_installer.rb

@@ -81,7 +81,7 @@ module Pod
       #
       def download_source
         root.rmtree if root.exist?
-        if head_pod?
+        if head_pod? && !sandbox.checkout_sources[root_spec.name]
           begin
             downloader.download_head
             @specific_source = downloader.checkout_options
@@ -148,7 +148,7 @@ module Pod
       #         source.
       #
       def downloader
-        @downloader ||= Downloader.for_target(root, root_spec.source.dup)
+        @downloader ||= Downloader.for_target(root, sandbox.checkout_sources[root_spec.name] || root_spec.source.dup)
       end
 
       #-----------------------------------------------------------------------#

lib/cocoapods/resolver.rb

@@ -302,7 +302,10 @@ module Pod
     def find_cached_set(dependency)
       name = dependency.root_name
       unless cached_sets[name]
-        if dependency.external_source
+        if dependency.head?
+          spec = create_set_from_sources(dependency).specification
+          set = Specification::Set::Head.new(spec)
+        elsif dependency.external_source
           spec = sandbox.specification(name)
           unless spec
             raise StandardError, '[Bug] Unable to find the specification ' \
@@ -312,9 +315,7 @@ module Pod
         else
           set = create_set_from_sources(dependency)
         end
-        if dependency.head?
-          set = Specification::Set::Head.new(set.specification)
-        end
+
         cached_sets[name] = set
         unless set
           raise Molinillo::NoSuchDependencyError.new(dependency) # rubocop:disable Style/RaiseArgs