From mboxrd@z Thu Jan 1 00:00:00 1970 From: Jim Meyering Subject: Re: [PATCH] make the sample pre-commit hook script reject names with newlines, too Date: Sat, 22 Oct 2011 19:44:40 +0200 Message-ID: <87aa8sgbuf.fsf@rho.meyering.net> References: <87obx9eygk.fsf@rho.meyering.net> Mime-Version: 1.0 Content-Type: text/plain Cc: git list To: Andreas Schwab X-From: git-owner@vger.kernel.org Sat Oct 22 19:44:58 2011 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1RHfcu-0007VB-Ti for gcvg-git-2@lo.gmane.org; Sat, 22 Oct 2011 19:44:57 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754497Ab1JVRou (ORCPT ); Sat, 22 Oct 2011 13:44:50 -0400 Received: from smtp5-g21.free.fr ([212.27.42.5]:48054 "EHLO smtp5-g21.free.fr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754485Ab1JVRot (ORCPT ); Sat, 22 Oct 2011 13:44:49 -0400 Received: from mx.meyering.net (unknown [88.168.87.75]) by smtp5-g21.free.fr (Postfix) with ESMTP id 5C6B6D480B3 for ; Sat, 22 Oct 2011 19:44:42 +0200 (CEST) Received: from rho.meyering.net (localhost.localdomain [127.0.0.1]) by rho.meyering.net (Acme Bit-Twister) with ESMTP id 657D86007E; Sat, 22 Oct 2011 19:44:40 +0200 (CEST) In-Reply-To: (Andreas Schwab's message of "Sat, 22 Oct 2011 19:35:42 +0200") Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Andreas Schwab wrote: > Jim Meyering writes: > >> @@ -26,7 +29,7 @@ if [ "$allownonascii" != "true" ] && >> # even required, for portability to Solaris 10's /usr/bin/tr), since >> # the square bracket bytes happen to fall in the designated range. >> test "$(git diff --cached --name-only --diff-filter=A -z $against | >> - LC_ALL=C tr -d '[ -~]\0')" >> + LC_ALL=C tr -d '[ -~]\0' | wc -c)" != 0 > > This will fail if the output of wc contains leading spaces. Good point. Thanks. That's a portability bug. GNU wc outputs no leading spaces, but others certainly do. Removing the double quotes fixes that: -- >8 -- Subject: [PATCH] make the sample pre-commit hook script reject names with newlines, too The sample pre-commit hook script would fail to reject a file name like "a\nb" because of the way newlines are handled in "$(...)". Adjust the test to count filtered bytes and require there be 0. Also print all diagnostics to standard error, not stdout, so they will actually be seen. Signed-off-by: Jim Meyering --- templates/hooks--pre-commit.sample | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/templates/hooks--pre-commit.sample b/templates/hooks--pre-commit.sample index b187c4b..18c4829 100755 --- a/templates/hooks--pre-commit.sample +++ b/templates/hooks--pre-commit.sample @@ -18,6 +18,9 @@ fi # If you want to allow non-ascii filenames set this variable to true. allownonascii=$(git config hooks.allownonascii) +# Redirect output to stderr. +exec 1>&2 + # Cross platform projects tend to avoid non-ascii filenames; prevent # them from being added to the repository. We exploit the fact that the # printable range starts at the space character and ends with tilde. @@ -25,8 +28,8 @@ if [ "$allownonascii" != "true" ] && # Note that the use of brackets around a tr range is ok here, (it's # even required, for portability to Solaris 10's /usr/bin/tr), since # the square bracket bytes happen to fall in the designated range. - test "$(git diff --cached --name-only --diff-filter=A -z $against | - LC_ALL=C tr -d '[ -~]\0')" + test $(git diff --cached --name-only --diff-filter=A -z $against | + LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0 then echo "Error: Attempt to add a non-ascii file name." echo @@ -43,4 +46,5 @@ then exit 1 fi +# If there are whitespace errors, print the offending file names and fail. exec git diff-index --check --cached $against -- -- 1.7.7.419.g87009