X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=templates%2Fhooks--pre-commit;h=43d3b6ef4a0e515cdc8d9874a81029d4d9425f64;hb=8b42f5ae545d494463e72430fd81a0c0c558c881;hp=075eb3c1f4ca272f095c92dd1b99f3286924bff7;hpb=b909a15edef8c79b2b045bd90d25e19ea58f299c;p=git.git

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 075eb3c1..43d3b6ef 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -1,7 +1,7 @@
 #!/bin/sh
 #
 # An example hook script to verify what is about to be committed.
-# Called by git-commit-script with no arguments.  The hook should
+# Called by git-commit with no arguments.  The hook should
 # exit with non-zero status after issuing an appropriate message if
 # it wants to stop the commit.
 #
@@ -10,8 +10,16 @@
 # This is slightly modified from Andrew Morton's Perfect Patch.
 # Lines you introduce should not have trailing whitespace.
 # Also check for an indentation that has SP before a TAB.
+
+if git-rev-parse --verify HEAD 2>/dev/null
+then
+	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.
+	:
+fi |
 perl -e '
-    my $fh;
     my $found_bad = 0;
     my $filename;
     my $reported_filename = "";
@@ -31,8 +39,7 @@ perl -e '
 	print STDERR "* $why (line $lineno)\n";
 	print STDERR "$filename:$lineno:$line\n";
     }
-    open $fh, "-|", qw(git-diff-cache -p -M --cached HEAD);
-    while (<$fh>) {
+    while (<>) {
 	if (m|^diff --git a/(.*) b/\1$|) {
 	    $filename = $1;
 	    next;