rultor: Use fast-forward builtin

As per my request this option was now built into rultor and is tested. As soon as yegor256/rultor#878 gets resolved, we can also remove the succeed.sh script.
coala · Jun 24, 2015 · 581d716 · 581d716 · fneu · Jun 24, 2015
1 parent 20538a6
commit 581d716
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 12 deletions.
diff --git a/.misc/fail_if_HEAD_is_merge.sh b/.misc/fail_if_HEAD_is_merge.sh
diff --git a/.misc/succeed.sh b/.misc/succeed.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+exit 0
diff --git a/.rultor.yml b/.rultor.yml
@@ -1,3 +1,4 @@
 merge:
+  fast-forward: only
   script:
-    - "bash .misc/fail_if_HEAD_is_merge.sh"
+    - "bash .misc/succeed.sh"