From 0cc3817216a3f949f95e7647abe136535dcd3e14 Mon Sep 17 00:00:00 2001 From: j2blake Date: Fri, 18 Oct 2013 15:04:43 -0400 Subject: [PATCH] Adjust the release script to an older Git client --- utilities/releaseScripts/7_merge_to_master.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utilities/releaseScripts/7_merge_to_master.rb b/utilities/releaseScripts/7_merge_to_master.rb index 674013f0..e6d90bfb 100644 --- a/utilities/releaseScripts/7_merge_to_master.rb +++ b/utilities/releaseScripts/7_merge_to_master.rb @@ -24,7 +24,7 @@ def merge_branch_to_master(branch, tag, message, repo_path) "git merge --no-ff -Xtheirs #{branch}", "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}") end end