From 50872f4a15a2070fa007c1d85fcf44802e4bcc0b Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada Date: Tue, 30 Apr 2019 22:23:20 +0900 Subject: Use array mode of `system` instead of `shellescape` `&.` is not available in ruby 2.0. --- tool/merger.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'tool/merger.rb') diff --git a/tool/merger.rb b/tool/merger.rb index 025a559408..5f48f2eeca 100755 --- a/tool/merger.rb +++ b/tool/merger.rb @@ -196,10 +196,11 @@ class << Merger def diff(file = nil) if svn_mode? - `svn diff --diff-cmd=diff -x -upw #{file&.shellescape}` + command = %w[svn diff --diff-cmd=diff -x -upw] else - `git diff --color #{file&.shellescape}` + command = %w[git diff --color] end + IO.popen(command + [file], &:read) end def commit(file) -- cgit v1.2.3