X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=templates%2Fhooks--pre-commit;h=4bb6803b105505fd89b24a17403e8210c42c06be;hb=5e3a769186bc41f94c1970579f96f3b68b046ed6;hp=dad99bcf1029e17045c45a97ffe7b18657c1e237;hpb=b0e985d5de5623a56a3ff1e8a77af6323774f93f;p=git.git

diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index dad99bcf..4bb6803b 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.
 #
@@ -19,19 +19,19 @@ perl -e '
     sub bad_line {
 	my ($why, $line) = @_;
 	if (!$found_bad) {
-	    print "*\n";
-	    print "* You have some suspicious patch lines:\n";
-	    print "*\n";
+	    print STDERR "*\n";
+	    print STDERR "* You have some suspicious patch lines:\n";
+	    print STDERR "*\n";
 	    $found_bad = 1;
 	}
 	if ($reported_filename ne $filename) {
-	    print "* In $filename\n";
+	    print STDERR "* In $filename\n";
 	    $reported_filename = $filename;
 	}
-	print "* $why (line $lineno)\n";
-	print "$filename:$lineno:$line\n";
+	print STDERR "* $why (line $lineno)\n";
+	print STDERR "$filename:$lineno:$line\n";
     }
-    open $fh, "-|", qw(git-diff-cache -p -M --cached HEAD);
+    open $fh, "-|", qw(git-diff-index -p -M --cached HEAD);
     while (<$fh>) {
 	if (m|^diff --git a/(.*) b/\1$|) {
 	    $filename = $1;