From 0082f23cf68e6bac9ad07e0a33ede00dba5084a5 Mon Sep 17 00:00:00 2001
From: Russell Taylor <taylorrj@ornl.gov>
Date: Mon, 7 Nov 2011 11:20:20 -0500
Subject: [PATCH] Lessen the pain. Re #3977.

---
 .githooks/pre-commit | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.githooks/pre-commit b/.githooks/pre-commit
index 144b65ef3ab..d3e0f3b9245 100755
--- a/.githooks/pre-commit
+++ b/.githooks/pre-commit
@@ -69,7 +69,7 @@ fi
 
 #-----------------------------------------------------------------------------
 # Builtin whitespace checks.
-bad=$(git diff-index --check --cached $against --) || die "$bad"
+bad=$(git diff-index --check --cached $against -- --ignore-space-at-eol) || die "$bad"
 
 # Approximate whitespace=tab-in-indent check with Git < 1.7.2.
 git --version | grep -q " \(1\.[0-6]\|1\.7\.[01]\)" &&
-- 
GitLab