diff options
author | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-15 12:48:26 +0000 |
---|---|---|
committer | eregon <eregon@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2017-06-15 12:48:26 +0000 |
commit | 5ccf36c7ec8687199424d0966374343477ad55f8 (patch) | |
tree | 72a08e4b4634a0d1e1e33a02e61a07aa3c574a47 /spec/mspec/tool | |
parent | bd8412b74f50d9ec7bee369970598532a828ed99 (diff) | |
download | ruby-5ccf36c7ec8687199424d0966374343477ad55f8.tar.gz |
Update to ruby/mspec@d900a49
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@59092 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'spec/mspec/tool')
-rw-r--r-- | spec/mspec/tool/sync/sync-rubyspec.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/spec/mspec/tool/sync/sync-rubyspec.rb b/spec/mspec/tool/sync/sync-rubyspec.rb index e7f054ca60..be5082e240 100644 --- a/spec/mspec/tool/sync/sync-rubyspec.rb +++ b/spec/mspec/tool/sync/sync-rubyspec.rb @@ -24,6 +24,9 @@ raise RUBYSPEC_REPO unless Dir.exist?(RUBYSPEC_REPO) NOW = Time.now +BRIGHT_YELLOW = "\e[33;1m" +RESET = "\e[0m" + class RubyImplementation attr_reader :name @@ -110,7 +113,7 @@ def rebase_commits(impl) rebased = impl.rebased_branch if branch?(rebased) - puts "#{rebased} already exists, assuming it correct" + puts "#{BRIGHT_YELLOW}#{rebased} already exists, assuming it correct#{RESET}" sh "git", "checkout", rebased else sh "git", "checkout", impl.name @@ -118,7 +121,7 @@ def rebase_commits(impl) if ENV["LAST_MERGE"] last_merge = `git log -n 1 --format='%H %ct' #{ENV["LAST_MERGE"]}` else - last_merge = `git log --grep='#{impl.last_merge_message}' -n 1 --format='%H %ct'` + last_merge = `git log --grep='^#{impl.last_merge_message}' -n 1 --format='%H %ct'` end last_merge, commit_timestamp = last_merge.chomp.split(' ') |