Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 8901

Show
Ignore:
Timestamp:
02/19/08 23:19:53 (5 months ago)
Author:
minam
Message:

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

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • tools/capistrano/CHANGELOG

    r8761 r8901  
    11*SVN* 
     2 
     3* Use checkout instead of merge for git SCM [nuttycom] 
    24 
    35* Fix typo in Subversion SCM module, encountered when an update fails [kemiller] 

  • tools/capistrano/lib/capistrano/recipes/deploy/scm/git.rb

    r8755 r8901  
    120120 
    121121          execute << "cd #{destination}" 
    122           execute << "#{git} checkout -b deploy #{branch}"  
     122          execute << "#{git} checkout #{branch}"  
    123123          if configuration[:git_enable_submodules] 
    124124            execute << "#{git} submodule init"  
    …… 
    137137 
    138138          if head == 'HEAD' 
    139             execute << "#{git} merge origin/HEAD" 
     139            execute << "#{git} checkout origin/HEAD" 
    140140          else 
    141             execute << "#{git} merge #{head}" 
     141            execute << "#{git} checkout #{head}" 
    142142          end 
    143143