Skip to content

C
core
Kaydet (Commit) bc31fc9c authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud
Dosyalara gözat
Seçenekler

be stricter with tab 

Change-Id: I17db9db426b10e0cb2148b33dfc9631ea9cb81a4
üst f5e1c753
Hide whitespace changes
Inline Side-by-side
Showing with 60 additions and 46 deletions
git-hooks/pre-commit
Dosyayı görüntüle @ bc31fc9c
...@@ -21,57 +21,70 @@ sub check_whitespaces($) ...@@ -21,57 +21,70 @@ sub check_whitespaces($)
my $filename; my $filename;
my $reported_filename = ""; my $reported_filename = "";
my $lineno; my $lineno;
sub bad_line { sub bad_line
my ($why, $line, $file_filter) = @_; {
if (!defined $file_filter || $filename =~ /\.($file_filter)$/) { my ($why, $line, $file_filter) = @_;
if (!$found_bad) { if (!defined $file_filter || $filename =~ /\.($file_filter)$/)
print STDERR "*\n"; {
print STDERR "* You have some suspicious patch lines:\n"; if (!$found_bad)
print STDERR "*\n"; {
$found_bad = 1; print STDERR "*\n";
} print STDERR "* You have some suspicious patch lines:\n";
if ($reported_filename ne $filename) { print STDERR "*\n";
print STDERR "* In $filename\n"; $found_bad = 1;
$reported_filename = $filename; }
} if ($reported_filename ne $filename)
print STDERR "* $why (line $lineno)\n"; {
print STDERR "$filename:$lineno:$line\n"; print STDERR "* In $filename\n";
$reported_filename = $filename;
}
print STDERR "* $why (line $lineno)\n";
print STDERR "$filename:$lineno:$line\n";
} }
} }
open( FILES, "git-diff-index -p -M --cached $h |" ) || die "Cannot run git diff-index."; open( FILES, "git-diff-index -p -M --cached $h |" ) || die "Cannot run git diff-index.";
while (<FILES>) { while (<FILES>)
if (m|^diff --git a/(.*) b/\1$|) { {
$filename = $1; if (m|^diff --git a/(.*) b/\1$|)
next; {
} $filename = $1;
if (/^@@ -\S+ \+(\d+)/) { next;
$lineno = $1 - 1; }
next; if (/^@@ -\S+ \+(\d+)/)
} {
if (/^ /) { $lineno = $1 - 1;
$lineno++; next;
next; }
} if (/^ /)
if (s/^\+//) { {
$lineno++; $lineno++;
chomp; next;
if (/\s$/) { }
bad_line("trailing whitespace", $_ , $src_limited); if (s/^\+//)
} {
if (/^\s* /) { $lineno++;
bad_line("indent SP followed by a TAB", $_, $src_limited); chomp;
} if (/\s$/)
if (/^(?:[<>=]){7}$/) { {
bad_line("unresolved merge conflict", $src_full); bad_line("trailing whitespace", $_ , $src_limited);
} }
if (/SAL_DEBUG/) { if (/\s* /)
bad_line("temporary debug in commit", $_, $src_limited); {
} bad_line("indent with Tab", $_, $src_limited);
} }
if (/^(?:[<>=]){7}$/)
{
bad_line("unresolved merge conflict", $src_full);
}
if (/SAL_DEBUG/)
{
bad_line("temporary debug in commit", $_, $src_limited);
}
}
} }
if ( $found_bad) if ( $found_bad)
{ {
exit($found_bad); exit($found_bad);
} }
} }
...@@ -79,7 +92,8 @@ sub check_whitespaces($) ...@@ -79,7 +92,8 @@ sub check_whitespaces($)
# Initial commit: diff against an empty tree object # Initial commit: diff against an empty tree object
my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904"; my $against="4b825dc642cb6eb9a060e54bf8d69288fbee4904";
if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 ) { if ( system( "git rev-parse --verify HEAD >/dev/null 2>&1" ) == 0 )
{
$against="HEAD" $against="HEAD"
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment