diff options
author | Nobuyoshi Nakada <[email protected]> | 2019-04-30 22:23:20 +0900 |
---|---|---|
committer | Nobuyoshi Nakada <[email protected]> | 2019-04-30 22:23:20 +0900 |
commit | 50872f4a15a2070fa007c1d85fcf44802e4bcc0b (patch) | |
tree | 62b12fba3be28a6c172dd2ea470130c83e6b803e | |
parent | df3de409325d1e95d375a736d2bc9c45d47ec317 (diff) |
Use array mode of `system` instead of `shellescape`
`&.` is not available in ruby 2.0.
-rwxr-xr-x | tool/merger.rb | 5 |
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) |