From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 23 Nov 2007 07:25:42 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.5.4-rc0~157
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f81117b84d2c99a29acf06c6522aad54defbc760?ds=inline;hp=-c

Merge branch 'maint'

* maint:
Fix sample pre-commit hook
---

f81117b84d2c99a29acf06c6522aad54defbc760
diff --combined templates/hooks--pre-commit
index a19279b3e4,8b057be304..7092bae263
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@@ -13,7 -13,7 +13,7 @@@
  
  if git-rev-parse --verify HEAD 2>/dev/null
  then
- 	git-diff-index -p -M --cached HEAD
+ 	git-diff-index -p -M --cached HEAD --
  else
  	# NEEDSWORK: we should produce a diff with an empty tree here
  	# if we want to do the same verification for the initial import.
@@@ -58,7 -58,7 +58,7 @@@ perl -e 
  	    if (/\s$/) {
  		bad_line("trailing whitespace", $_);
  	    }
 -	    if (/^\s* 	/) {
 +	    if (/^\s* \t/) {
  		bad_line("indent SP followed by a TAB", $_);
  	    }
  	    if (/^(?:[<>=]){7}/) {