summaryrefslogtreecommitdiff
path: root/spec/mspec/tool
diff options
context:
space:
mode:
authoreregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-21 22:01:18 +0000
committereregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-08-21 22:01:18 +0000
commit2aefb19888a6c7b2be498308e32a2be1851bf918 (patch)
tree94c359586c01f2e4241130be568adbd575342107 /spec/mspec/tool
parentec1af131c8b9c370c4c0feaaabe56ac6be75971f (diff)
Update to ruby/mspec@269f9cd
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@64500 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec/tool')
-rw-r--r--spec/mspec/tool/sync/sync-rubyspec.rb1
1 files changed, 1 insertions, 0 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb
index 4a15b8e4ad..120a4ad64c 100644
--- a/spec/mspec/tool/sync/sync-rubyspec.rb
+++ b/spec/mspec/tool/sync/sync-rubyspec.rb
@@ -192,6 +192,7 @@ def fast_forward_master(impl)
Dir.chdir(SOURCE_REPO) do
sh "git", "checkout", "master"
sh "git", "merge", "--ff-only", "#{impl.name}-rebased"
+ sh "git", "branch", "--delete", "#{impl.name}-rebased"
end
end