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

use checkout instead of merge for git SCM (closes #10918)

Browse source 
git-svn-id: http://svn.rubyonrails.org/rails/tools/capistrano@8901 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck 2008-02-19 23:19:53 +00:00
parent 63f449b815
commit c2a223e6ec
2 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
*SVN* *SVN*
* Use checkout instead of merge for git SCM [nuttycom]
* Fix typo in Subversion SCM module, encountered when an update fails [kemiller] * Fix typo in Subversion SCM module, encountered when an update fails [kemiller]
* Fix documentation typo in upload.rb [evolving_jerk] * Fix documentation typo in upload.rb [evolving_jerk]

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

@ -119,7 +119,7 @@ module Capistrano
end end
execute << "cd #{destination}" execute << "cd #{destination}"
execute << "#{git} checkout -b deploy #{branch}" execute << "#{git} checkout #{branch}"
if configuration[:git_enable_submodules] if configuration[:git_enable_submodules]
execute << "#{git} submodule init" execute << "#{git} submodule init"
execute << "#{git} submodule update" execute << "#{git} submodule update"
@ -136,9 +136,9 @@ module Capistrano
execute << "cd #{destination} && #{git} fetch origin" execute << "cd #{destination} && #{git} fetch origin"
if head == 'HEAD' if head == 'HEAD'
execute << "#{git} merge origin/HEAD" execute << "#{git} checkout origin/HEAD"
else else
execute << "#{git} merge #{head}" execute << "#{git} checkout #{head}"
end end
if configuration[:git_enable_submodules] if configuration[:git_enable_submodules]