Ticket #10515: 0001-Bugfix-Git-scm-sync-method-ignored-value-of-scm.patch

a/lib/capistrano/recipes/deploy/scm/git.rb

@@ -125 +125 @@
-        # Merges the changes to 'head' since the last fetch, for remote_cache
-        # deployment strategy
-        def sync(revision, destination)
-
+
+
+
-
-          if head == 'HEAD'
-git
+#{git}
-          else
-git
+#{git}
-          end
-
-          execute

a/test/deploy/scm/git_test.rb

@@ -56 +56 @@
-    # With branch
-    @config[:branch] = "origin/foo"
-    assert_equal "cd #{dest} && git fetch origin && git merge origin/foo", @source.sync('Not used', dest)
+
+    # With :scm_command
+    @config[:scm_command] = "/opt/local/bin/git"
+    assert_equal "cd #{dest} && /opt/local/bin/git fetch origin && /opt/local/bin/git merge origin/foo", @source.sync('Not used', dest)
-  end
-
-  def test_shallow_clone