From c3ce3b47443fa7d35503dbccf42ddbebb7e50eea Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Tue, 30 Jan 2018 04:17:32 +0000
Subject: [PATCH] vcs.rb: checkout the current branch before rebase

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62105 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 tool/vcs.rb | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/tool/vcs.rb b/tool/vcs.rb
index e710448ec1..7e06f3dbcc 100644
--- a/tool/vcs.rb
+++ b/tool/vcs.rb
@@ -487,6 +487,7 @@ class VCS
     def commit
       rev = cmd_read(%W"#{COMMAND} svn info"+[STDERR=>[:child, :out]])[/^Last Changed Rev: (\d+)/, 1]
       com = cmd_read(%W"#{COMMAND} svn find-rev r#{rev}").chomp
+      head = cmd_read(%W"#{COMMAND} symbolic-ref --short HEAD").chomp
 
       commits = cmd_read([COMMAND, "log", "--reverse", "--format=%H %ae %ce", "#{com}..@"], "rb").split("\n")
       commits.each_with_index do |l, i|
@@ -496,6 +497,7 @@ class VCS
         dcommit << "--add-author-from" unless a == c
         dcommit << r
         system(*dcommit) or return false
+        system(COMMAND, "checkout", head) or return false
         system(COMMAND, "rebase") or return false
       end