X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/a8f63f70a72d3c11397614f7960fd39685ce8b9a..8418659704c0c8ecfdbce4dd8c2ed27bf1a33008:/hooks/pre-commit?ds=sidebyside diff --git a/hooks/pre-commit b/hooks/pre-commit index 7c7655e5d..60d665932 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -3,7 +3,7 @@ ok = true if IO.popen(["git", "ls-files", "--unmerged"]).read.empty? - need_stash = !IO.popen(%w(git diff)).read.empty? + need_stash = !IO.popen(%w[git diff]).read.empty? system("git", "stash", "save", "--keep-index", "--quiet") if need_stash @@ -12,7 +12,7 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty? end.compact ruby_files = files.select do |file| - file =~ /\.rb$/ || (file !~ /\.erb$/ && `file --brief --mime-type #{file}` == "text/x-ruby\n") + file =~ /\.rb$/ || (file !~ /\.erb$/ && %x(file --brief --mime-type #{file}) == "text/x-ruby\n") end ok &&= system("bundle", "exec", "rubocop", *ruby_files) unless ruby_files.empty?