Only ignore whitespace errors in t/tNNNN-*.sh and the t/tNNNN subdirectories (since they can contain test-relevant trailing whitespace). Other files (like test libraries) should still be checked. Also fix a whitespace error in t/test-lib.sh. Signed-off-by: Lea Wiemann <LeWiemann@xxxxxxxxx> --- Jeff King wrote: > What is the difference between test-lib.sh and tNNNN-*.sh that makes one > subject to whitespace checking and the other not? I thought that was obvious since they had been not been checked before either (see the diff). :) Anyways, added explanation in parens in the commit message; nothing else has changed since v1. t/.gitattributes | 3 ++- t/test-lib.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/t/.gitattributes b/t/.gitattributes index 562b12e..ab6edbf 100644 --- a/t/.gitattributes +++ b/t/.gitattributes @@ -1 +1,2 @@ -* -whitespace +t[0-9][0-9][0-9][0-9]-*.sh -whitespace +t[0-9][0-9][0-9][0-9]/* -whitespace diff --git a/t/test-lib.sh b/t/test-lib.sh index 7a8bd27..e9c9081 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -168,7 +168,7 @@ trap 'die' exit # environment variables to work around this. # # In particular, quoting isn't enough, as the path may contain the same quote -# that we're using. +# that we're using. test_set_editor () { FAKE_EDITOR="$1" export FAKE_EDITOR -- 1.5.6.rc2.33.g0b5e3.dirty -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html