summaryrefslogtreecommitdiff
path: root/tool/merger.rb
diff options
context:
space:
mode:
authorNobuyoshi Nakada <nobu@ruby-lang.org>2019-04-30 22:23:20 +0900
committerNobuyoshi Nakada <nobu@ruby-lang.org>2019-04-30 22:23:20 +0900
commit50872f4a15a2070fa007c1d85fcf44802e4bcc0b (patch)
tree62b12fba3be28a6c172dd2ea470130c83e6b803e /tool/merger.rb
parentdf3de409325d1e95d375a736d2bc9c45d47ec317 (diff)
Use array mode of `system` instead of `shellescape`
`&.` is not available in ruby 2.0.
Diffstat (limited to 'tool/merger.rb')
-rwxr-xr-xtool/merger.rb5
1 files changed, 3 insertions, 2 deletions
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)