From f013a1057fbda7a2c19fc0133701f1ef09e37a95 Mon Sep 17 00:00:00 2001 From: Igor Rzegocki Date: Wed, 21 Jun 2017 13:03:04 +0200 Subject: [PATCH] Fix support for binary files in LineEndings hook --- CHANGELOG.md | 4 ++++ lib/overcommit/hook/pre_commit/line_endings.rb | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b49f9522..eeb07e1c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Overcommit Changelog +## master + +* Fix binary files detection in `LineEndings` pre-commit hook + ## 0.40.0 * Add [`Pronto`](https://github.com/mmozuras/pronto) pre-commit hook diff --git a/lib/overcommit/hook/pre_commit/line_endings.rb b/lib/overcommit/hook/pre_commit/line_endings.rb index df014269..4c54c83f 100644 --- a/lib/overcommit/hook/pre_commit/line_endings.rb +++ b/lib/overcommit/hook/pre_commit/line_endings.rb @@ -54,8 +54,8 @@ def offending_files result.stdout.split("\0").map do |file_info| i, _w, _attr, path = file_info.split - next if i == 'l/-text' # ignore binary files - next if i == "l/#{eol}" + next if i.match(/\A[li]\/-text\z/) # ignore binary files + next if i.match(/\A[li]\/#{eol}\z/) path end.compact end