summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-01-30 01:56:45 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-01-30 01:56:45 (GMT)
commit36b5b3c65948694d9a92de5a17f2b97c3cd84879 (patch)
treefa20efe758607290af652d3c32b110a483059b86 /templates
parent34801cab72e8262d2585f72f15b62a397f0c6c1a (diff)
parent8fedb83c05d4b3d877a220d614e8b9d40f02709d (diff)
downloadgit-36b5b3c65948694d9a92de5a17f2b97c3cd84879.zip
git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.gz
git-36b5b3c65948694d9a92de5a17f2b97c3cd84879.tar.bz2
Merge fixes up to GIT 1.1.6
Diffstat (limited to 'templates')
-rw-r--r--templates/hooks--pre-commit13
1 files changed, 10 insertions, 3 deletions
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 4bb6803..43d3b6e 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-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-index -p -M --cached HEAD);
- while (<$fh>) {
+ while (<>) {
if (m|^diff --git a/(.*) b/\1$|) {
$filename = $1;
next;