litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust the release script to an older Git client

Browse source
This commit is contained in:
j2blake 2013-10-18 15:04:43 -04:00
parent 02280e6171
commit 0cc3817216
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
utilities/releaseScripts/7_merge_to_master.rb
View file

@ -24,7 +24,7 @@ def merge_branch_to_master(branch, tag, message, repo_path)
"git merge --no-ff -Xtheirs #{branch}", "git merge --no-ff -Xtheirs #{branch}",
"git tag -a -f #{tag} -m '#{message}'" "git tag -a -f #{tag} -m '#{message}'"
] ]
cmds.insert(0, "git branch master origin/master") if `git branch --list master`.strip.empty? cmds.insert(0, "git branch master origin/master") unless branch_exists?(path, "master")
approve_and_execute(cmds, "in #{path}") approve_and_execute(cmds, "in #{path}")
end end
end end