diff --git a/CHANGELOG b/CHANGELOG index 76ef9933..f65d673b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Added test case to show that the :scm_command is honored by the git SCM module [grempe] + * Fail gracefully when double-colons are used to delimit namespaces [richie] * Add support for :git_enable_submodules variable, to enable submodules with the git SCM [halorgium] diff --git a/test/deploy/scm/git_test.rb b/test/deploy/scm/git_test.rb index efda9b56..84c3f2b9 100644 --- a/test/deploy/scm/git_test.rb +++ b/test/deploy/scm/git_test.rb @@ -56,6 +56,10 @@ class DeploySCMGitTest < Test::Unit::TestCase # 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