summaryrefslogtreecommitdiff
path: root/templates/hooks--pre-commit
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-04-19 21:58:24 (GMT)
committerJunio C Hamano <junkio@cox.net>2006-04-19 22:37:40 (GMT)
commit61c2bcbd11e3b66a328b3850c01592e5dc1c67bb (patch)
treee0993e24ded9047c25d3ff9bdff58791f9699026 /templates/hooks--pre-commit
parent50ac7408018209a2829b7948119270fec7e14ec8 (diff)
downloadgit-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.zip
git-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.tar.gz
git-61c2bcbd11e3b66a328b3850c01592e5dc1c67bb.tar.bz2
pre-commit hook: complain about conflict markers.
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>
Diffstat (limited to 'templates/hooks--pre-commit')
-rw-r--r--templates/hooks--pre-commit3
1 files changed, 3 insertions, 0 deletions
diff --git a/templates/hooks--pre-commit b/templates/hooks--pre-commit
index 43d3b6e..723a9ef 100644
--- a/templates/hooks--pre-commit
+++ b/templates/hooks--pre-commit
@@ -61,6 +61,9 @@ perl -e '
if (/^\s* /) {
bad_line("indent SP followed by a TAB", $_);
}
+ if (/^(?:[<>=]){7}/) {
+ bad_line("unresolved merge conflict", $_);
+ }
}
}
exit($found_bad);