X-Git-Url: https://git.openstreetmap.org./chef.git/blobdiff_plain/ae2ef9ff4f0542d2bb2f8bbe6d6b6f27ec5c55f8..83f3e81a0ee82d24cf320e42ace535d0c4ba5b4e:/hooks/pre-commit diff --git a/hooks/pre-commit b/hooks/pre-commit index de3142ea0..55d23300c 100755 --- a/hooks/pre-commit +++ b/hooks/pre-commit @@ -7,7 +7,9 @@ if IO.popen(["git", "ls-files", "--unmerged"]).read.empty? system("git", "stash", "save", "--keep-index", "--quiet") if need_stash - files = IO.popen(["git", "diff", "--staged", "--name-only"]).readlines.map(&:chomp) + files = IO.popen(["git", "diff", "--staged", "--name-status"]).map do |line| + Regexp.last_match(1) if line =~ /^[AM]\s+(.*)$/ + end.compact ruby_files = files.select do |file| file =~ /\.rb$/ || `file --brief --mime-type #{file}` == "text/x-ruby\n"