mirror of
https://github.com/git/git.git
synced 2024-10-30 22:07:53 +01:00
61c2bcbd11
Several <<< or === or >>> characters at the beginning of a line is very likely to be leftover conflict markers from a failed automerge the user resolved incorrectly, so detect them. As usual, this can be defeated with "git commit --no-verify" if you really do want to have those files, just like changes that introduce trailing whitespaces. Signed-off-by: Junio C Hamano <junkio@cox.net>
71 lines
1.7 KiB
Bash
71 lines
1.7 KiB
Bash
#!/bin/sh
|
|
#
|
|
# An example hook script to verify what is about to be committed.
|
|
# 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.
|
|
#
|
|
# To enable this hook, make this file executable.
|
|
|
|
# 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 $found_bad = 0;
|
|
my $filename;
|
|
my $reported_filename = "";
|
|
my $lineno;
|
|
sub bad_line {
|
|
my ($why, $line) = @_;
|
|
if (!$found_bad) {
|
|
print STDERR "*\n";
|
|
print STDERR "* You have some suspicious patch lines:\n";
|
|
print STDERR "*\n";
|
|
$found_bad = 1;
|
|
}
|
|
if ($reported_filename ne $filename) {
|
|
print STDERR "* In $filename\n";
|
|
$reported_filename = $filename;
|
|
}
|
|
print STDERR "* $why (line $lineno)\n";
|
|
print STDERR "$filename:$lineno:$line\n";
|
|
}
|
|
while (<>) {
|
|
if (m|^diff --git a/(.*) b/\1$|) {
|
|
$filename = $1;
|
|
next;
|
|
}
|
|
if (/^@@ -\S+ \+(\d+)/) {
|
|
$lineno = $1 - 1;
|
|
next;
|
|
}
|
|
if (/^ /) {
|
|
$lineno++;
|
|
next;
|
|
}
|
|
if (s/^\+//) {
|
|
$lineno++;
|
|
chomp;
|
|
if (/\s$/) {
|
|
bad_line("trailing whitespace", $_);
|
|
}
|
|
if (/^\s* /) {
|
|
bad_line("indent SP followed by a TAB", $_);
|
|
}
|
|
if (/^(?:[<>=]){7}/) {
|
|
bad_line("unresolved merge conflict", $_);
|
|
}
|
|
}
|
|
}
|
|
exit($found_bad);
|
|
'
|
|
|