lib/capistrano/git-submodule-strategy.rb in capistrano-git-submodule-strategy-0.1.20 vs lib/capistrano/git-submodule-strategy.rb in capistrano-git-submodule-strategy-0.1.22

@@ -33,18 +33,29 @@
 
     # put the working tree in a release-branch,
     # make sure the submodules are up-to-date
     # and copy everything to the release path
     def release
-      unless context.test(:test, '-e', release_path) && context.test("ls -A #{release_path} | read linevar")
-        git :clone, "--reference #{repo_path}", (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), repo_url, release_path
+      return if context.test(:test, '-e', release_path) && context.test("ls -A #{release_path} | read linevar")
+
+      git_version = context.capture(:git, '--version').strip.match('^git version (\d+(?:\.\d+)+)$')
+
+      if git_version.nil? || git_version[1] < '2.3.0'
+        git :clone, (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), "file://#{repo_path}", release_path
         context.within_only release_path do
-          git :submodule, 'update', '--init', '--recursive'
+          git :remote, 'set-url', 'origin', repo_url
         end
-        unless fetch(:git_keep_meta, false)
-          verbose = Rake.application.options.trace ? 'v' : ''
-          context.execute("find #{release_path} -name '.git*' | xargs -I {} rm -rf#{verbose} '{}'")
-        end
+      else
+        git :clone, "--reference #{repo_path}", '--dissociate', (fetch(:git_keep_meta, false) ? '' : '--depth=1'), '-b', fetch(:branch), repo_url, release_path
+      end
+
+      context.within_only release_path do
+        git :submodule, 'update', '--init', '--recursive'
+      end
+
+      unless fetch(:git_keep_meta, false)
+        verbose = Rake.application.options.trace ? 'v' : ''
+        context.execute("find #{release_path} -name '.git*' | xargs -I {} rm -rf#{verbose} '{}'")
       end
     end
   end
 end
 
\ No newline at end of file