3 files changed, 69 insertions, 7 deletions
diff --git a/contrib/devtools/lint-logs.sh b/contrib/devtools/lint-logs.sh
new file mode 100755
index 0000000000..3bb54359a8
--- /dev/null
+++ b/contrib/devtools/lint-logs.sh
@@ -0,0 +1,25 @@
+#!/bin/bash
+#
+# Copyright (c) 2018 The Bitcoin Core developers
+# Distributed under the MIT software license, see the accompanying
+# file COPYING or http://www.opensource.org/licenses/mit-license.php.
+#
+# Check that all logs are terminated with '\n'
+#
+# Some logs are continued over multiple lines. They should be explicitly
+# commented with \* Continued *\
+#
+# There are some instances of LogPrintf() in comments. Those can be
+# ignored
+
+
+UNTERMINATED_LOGS=$(git grep "LogPrintf(" -- "*.cpp" | \
+    grep -v '\\n"' | \
+    grep -v "/\* Continued \*/" | \
+    grep -v "LogPrintf()")
+if [[ ${UNTERMINATED_LOGS} != "" ]]; then
+    echo "All calls to LogPrintf() should be terminated with \\n"
+    echo
+    echo "${UNTERMINATED_LOGS}"
+    exit 1
+fi
diff --git a/contrib/devtools/lint-tests.sh b/contrib/devtools/lint-tests.sh
index dd1a3ebdc4..ffc0660551 100755
--- a/contrib/devtools/lint-tests.sh
+++ b/contrib/devtools/lint-tests.sh
@@ -4,7 +4,9 @@
 # Distributed under the MIT software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
-# Check the test suite naming convention
+# Check the test suite naming conventions
+
+EXIT_CODE=0
 
 NAMING_INCONSISTENCIES=$(git grep -E '^BOOST_FIXTURE_TEST_SUITE\(' -- \
     "src/test/**.cpp" "src/wallet/test/**.cpp" | \
@@ -15,5 +17,18 @@ if [[ ${NAMING_INCONSISTENCIES} != "" ]]; then
     echo "that convention:"
     echo
     echo "${NAMING_INCONSISTENCIES}"
-    exit 1
+    EXIT_CODE=1
 fi
+
+TEST_SUITE_NAME_COLLISSIONS=$(git grep -E '^BOOST_FIXTURE_TEST_SUITE\(' -- \
+    "src/test/**.cpp" "src/wallet/test/**.cpp" | cut -f2 -d'(' | cut -f1 -d, | \
+    sort | uniq -d)
+if [[ ${TEST_SUITE_NAME_COLLISSIONS} != "" ]]; then
+    echo "Test suite names must be unique. The following test suite names"
+    echo "appear to be used more than once:"
+    echo
+    echo "${TEST_SUITE_NAME_COLLISSIONS}"
+    EXIT_CODE=1
+fi
+
+exit ${EXIT_CODE}
diff --git a/contrib/verify-commits/verify-commits.sh b/contrib/verify-commits/verify-commits.sh
index 532b97a438..6415eea4d5 100755
--- a/contrib/verify-commits/verify-commits.sh
+++ b/contrib/verify-commits/verify-commits.sh
@@ -35,6 +35,8 @@ NO_SHA1=1
 PREV_COMMIT=""
 INITIAL_COMMIT="${CURRENT_COMMIT}"
 
+BRANCH="$(git rev-parse --abbrev-ref HEAD)"
+
 while true; do
 	if [ "$CURRENT_COMMIT" = $VERIFIED_ROOT ]; then
 		echo "There is a valid path from \"$INITIAL_COMMIT\" to $VERIFIED_ROOT where all commits are signed!"
@@ -123,9 +125,29 @@ while true; do
 	fi
 
 	PARENTS=$(git show -s --format=format:%P "$CURRENT_COMMIT")
-	for PARENT in $PARENTS; do
-		PREV_COMMIT="$CURRENT_COMMIT"
-		CURRENT_COMMIT="$PARENT"
-		break
-	done
+	PARENT1=${PARENTS%% *}
+	PARENT2=""
+	if [ "x$PARENT1" != "x$PARENTS" ]; then
+		PARENTX=${PARENTS#* }
+		PARENT2=${PARENTX%% *}
+		if [ "x$PARENT2" != "x$PARENTX" ]; then
+			echo "Commit $CURRENT_COMMIT is an octopus merge" > /dev/stderr
+			exit 1
+		fi
+	fi
+	if [ "x$PARENT2" != "x" ]; then
+		CURRENT_TREE="$(git show --format="%T" "$CURRENT_COMMIT")"
+		git checkout --force --quiet "$PARENT1"
+		git merge --no-ff --quiet "$PARENT2" >/dev/null
+		RECREATED_TREE="$(git show --format="%T" HEAD)"
+		if [ "$CURRENT_TREE" != "$RECREATED_TREE" ]; then
+			echo "Merge commit $CURRENT_COMMIT is not clean" > /dev/stderr
+			git diff "$CURRENT_COMMIT"
+			git checkout --force --quiet "$BRANCH"
+			exit 1
+		fi
+		git checkout --force --quiet "$BRANCH"
+	fi
+	PREV_COMMIT="$CURRENT_COMMIT"
+	CURRENT_COMMIT="$PARENT1"
 done