rultor: Add rultor configuration

This will allow us to merge with a simple `@rultor merge` from collaborators. It will prohibit any non fastforward merge.
coala · Jun 17, 2015 · b9d0a64 · b9d0a64
1 parent d8bcd6d
commit b9d0a64
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 0 deletions.
diff --git a/.misc/fail_if_HEAD_is_merge.sh b/.misc/fail_if_HEAD_is_merge.sh
@@ -0,0 +1,8 @@
+#!/bin/bash
+
+if [[ "$(git log --merges HEAD^..)" == "" ]]; then
+    exit 0
+else
+    echo "Not possible to fastforward! Please rebase!"
+    exit 1
+fi
diff --git a/.rultor.yml b/.rultor.yml
@@ -0,0 +1,3 @@
+merge:
+  script:
+    - bash .misc/fail_if_HEAD_is_merge.sh