Add a linter to check for unresolved merges.

Author: mparker17

pre-commit/1-unresolved-merge.sh

@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+
+function test_file {
+  file="${1}"
+
+  if [ ! -f "${file}" ] ; then
+    return
+  fi
+
+	echo "Running unresolved merge lint..."
+  # Set -e before and +e after for _required_ linters (i.e.: that will prevent
+  # commit, e.g.: syntax linters).
+  # Set +e before and -e after for _optional_ linters (i.e.: that will only
+  # output messages upon commit, e.g.: style linters).
+  set -e
+  grep -i -E '^(<<<<<<<|=======|>>>>>>>)' $file
+  set +e
+}
+
+case "${1}" in
+  --about )
+    echo "Check for fishbones (<<<<<<<, =======, >>>>>>>) left by unresolved merges."
+    ;;
+
+  * )
+    for file in $(git diff-index --cached --name-only HEAD | grep -v -E '\.(gif|gz|ico|jpeg|jpg|png|phar|exe|svgz|tff)') ; do
+      test_file "${file}"
+    done
+    ;;
+esac