Merge branch '3.2.x'

* 3.2.x: [ticket/15683] Better error message when commit message has CRLF
fededj · Jul 8, 2018 · 0876a63 · 0876a63
2 parents 844ecb8 + 18f142e
commit 0876a63
Showing 1 changed file with 9 additions and 0 deletions.
diff --git a/git-tools/hooks/commit-msg b/git-tools/hooks/commit-msg
@@ -147,6 +147,15 @@ then
 	quit $ERR_LENGTH;
 fi
 
+# Check for CR/LF line breaks
+if grep -q $'\r$' "$1"
+then
+	complain "The commit message uses CR/LF line breaks, which are not permitted." >&2
+	complain >&2
+
+	quit $ERR_EOF;
+fi
+
 lines=$(wc -l "$1" | awk '{ print $1; }');
 expecting=header;
 in_description=0;