Skip to content
Snippets Groups Projects
Commit d37fd032 authored by Junio C Hamano's avatar Junio C Hamano
Browse files

[PATCH] pre-commit sample hook: do not barf on the initial import


The example hook barfs on the initial import.  Ideally it should
produce a diff from an empty tree, but for now let's stop at
squelching the bogus error message.  Often an initial import
involves tons of badly formatted files from foreign SCM, so not
complaining about them like this patch does might actually be a
better idea than enforcing the "Perfect Patch" format on them.

Signed-off-by: default avatarJunio C Hamano <junkio@cox.net>
parent 181dc776
No related branches found
No related tags found
No related merge requests found
...@@ -10,8 +10,16 @@ ...@@ -10,8 +10,16 @@
# This is slightly modified from Andrew Morton's Perfect Patch. # This is slightly modified from Andrew Morton's Perfect Patch.
# Lines you introduce should not have trailing whitespace. # Lines you introduce should not have trailing whitespace.
# Also check for an indentation that has SP before a TAB. # 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 ' perl -e '
my $fh;
my $found_bad = 0; my $found_bad = 0;
my $filename; my $filename;
my $reported_filename = ""; my $reported_filename = "";
...@@ -31,8 +39,7 @@ perl -e ' ...@@ -31,8 +39,7 @@ perl -e '
print STDERR "* $why (line $lineno)\n"; print STDERR "* $why (line $lineno)\n";
print STDERR "$filename:$lineno:$line\n"; print STDERR "$filename:$lineno:$line\n";
} }
open $fh, "-|", qw(git-diff-index -p -M --cached HEAD); while (<>) {
while (<$fh>) {
if (m|^diff --git a/(.*) b/\1$|) { if (m|^diff --git a/(.*) b/\1$|) {
$filename = $1; $filename = $1;
next; next;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment