Merge branch 'maint'

* maint:
Fix sample pre-commit hook

diff --combined templates/hooks--pre-commit
index a19279b3e41653b519b8c3b266bc7845f3648c4b,8b057be30411e3f0074599778666c1254d82329e..7092bae26342d273f28d52ac330c270a22067f65
--- 1/templates/hooks--pre-commit
--- 2/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}/) {