From 20ac84515a85c5beb96684482b0c135d3441b5d4 Mon Sep 17 00:00:00 2001
From: Thomas Miedema <thomasmiedema@gmail.com>
Date: Wed, 2 Sep 2015 14:01:47 +0200
Subject: [PATCH] Don't use --nocommit and --nobranch at the same time

Fixes #4.
---
 run.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/run.sh b/run.sh
index 9871cdc..e2eb40a 100755
--- a/run.sh
+++ b/run.sh
@@ -194,7 +194,8 @@ build_ghc_diff() {
     # -- Apply patches
     echo -n " - Applying diff $DIFF via Arcanist... "
     START=$(date +%s.%N)
-    arc patch --force --nocommit --nobranch --diff $DIFF >> build-log.txt 2>&1
+    # Don't use --nocommit and --nobranch at the same time (#4).
+    arc patch --force --nobranch --diff $DIFF >> build-log.txt 2>&1
     END=$(date +%s.%N)
     echo "OK (took about" $(echo "$END - $START" | bc) "seconds)"