kotovalexarian-likes-github/capistrano
1
0
Fork 0
mirror of https://github.com/capistrano/capistrano synced 2023-03-27 23:21:18 -04:00
Code Releases Activity

Make sure git fetches include tags [#6 tagged:committed status:resolved]

Browse source
This commit is contained in:
Jamis Buck 2008-05-02 14:42:26 -06:00
parent 552a492428
commit 838f6abd74
3 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
*unreleased* *unreleased*
* Make sure git fetches include tags [Alex Arnell]
* Make deploy:setup obey the :use_sudo and :runner directives, and generalize the :use_sudo and :runner options into a try_sudo() helper method [Jamis Buck] * Make deploy:setup obey the :use_sudo and :runner directives, and generalize the :use_sudo and :runner options into a try_sudo() helper method [Jamis Buck]
* Make sudo helper play nicely with complex command chains [Jamis Buck] * Make sudo helper play nicely with complex command chains [Jamis Buck]

2
lib/capistrano/recipes/deploy/scm/git.rb
View file

@ -184,7 +184,7 @@ module Capistrano
end end
# since we're in a local branch already, just reset to specified revision rather than merge # since we're in a local branch already, just reset to specified revision rather than merge
execute << "#{git} fetch #{remote} && #{git} reset --hard #{revision}" execute << "#{git} fetch --tags #{remote} && #{git} reset --hard #{revision}"
if configuration[:git_enable_submodules] if configuration[:git_enable_submodules]
execute << "#{git} submodule init" execute << "#{git} submodule init"

6
test/deploy/scm/git_test.rb
View file

@ -66,12 +66,12 @@ class DeploySCMGitTest < Test::Unit::TestCase
def test_sync def test_sync
dest = "/var/www" dest = "/var/www"
rev = 'c2d9e79' rev = 'c2d9e79'
assert_equal "cd #{dest} && git fetch origin && git reset --hard #{rev}", @source.sync(rev, dest) assert_equal "cd #{dest} && git fetch --tags origin && git reset --hard #{rev}", @source.sync(rev, dest)
# With :scm_command # With :scm_command
git = "/opt/local/bin/git" git = "/opt/local/bin/git"
@config[:scm_command] = git @config[:scm_command] = git
assert_equal "cd #{dest} && #{git} fetch origin && #{git} reset --hard #{rev}", @source.sync(rev, dest) assert_equal "cd #{dest} && #{git} fetch --tags origin && #{git} reset --hard #{rev}", @source.sync(rev, dest)
end end
def test_sync_with_remote def test_sync_with_remote
@ -83,7 +83,7 @@ class DeploySCMGitTest < Test::Unit::TestCase
@config[:repository] = repository @config[:repository] = repository
@config[:remote] = remote @config[:remote] = remote
assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch #{remote} && git reset --hard #{rev}", @source.sync(rev, dest) assert_equal "cd #{dest} && git config remote.#{remote}.url #{repository} && git config remote.#{remote}.fetch +refs/heads/*:refs/remotes/#{remote}/* && git fetch --tags #{remote} && git reset --hard #{rev}", @source.sync(rev, dest)
end end
def test_shallow_clone def test_shallow_clone