summaryrefslogtreecommitdiff
path: root/scripts/lint-conflicts.sh
diff options
context:
space:
mode:
authorLin Jen-Shin (godfat) <godfat@godfat.org>2017-08-01 12:06:56 +0000
committerRémy Coutable <remy@rymai.me>2017-08-01 12:06:56 +0000
commit913aca1db9b1bbf90f3490262c4429d95fbc517c (patch)
tree918d1cb291552aaf4b98a50eb65bcb7a37ff422a /scripts/lint-conflicts.sh
parent0bbf006454e47cb0411a0d035e45cda39739ca6f (diff)
downloadgitlab-ce-913aca1db9b1bbf90f3490262c4429d95fbc517c.tar.gz
Make sure we didn't commit conflicts
Diffstat (limited to 'scripts/lint-conflicts.sh')
-rwxr-xr-xscripts/lint-conflicts.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/scripts/lint-conflicts.sh b/scripts/lint-conflicts.sh
new file mode 100755
index 00000000000..f3877600c8c
--- /dev/null
+++ b/scripts/lint-conflicts.sh
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+output=`git ls-files -z | grep -zvE '\.(rb|js|haml)$' | xargs -0n1 grep -HEn '^<<<<<<< '`
+echo $output
+test -z "$output"