From 18afd41a80ede95e6dff3a9e0a7fb6b4e165d12c Mon Sep 17 00:00:00 2001
From: Tim Allen <screwtape@froup.com>
Date: Sun, 8 Oct 2017 18:17:48 +1100
Subject: [PATCH] Using "--no-commit" didn't work, let's try something else.

---
 .gitlab-ci.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c0e6d6b8..d30032ce 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -41,7 +41,9 @@ windows-x86_64-binaries:
 libretro-test:
   script:
     - apt-get update && apt-get -y install build-essential git
-    - git merge --no-commit origin/libretro
+    # git refuses to even attempt a merge if you haven't told it who you are,
+    # even if you use --no-commit. *sigh*
+    - EMAIL=fake-email@example.com git merge origin/libretro
     - make -C higan compiler=g++ binary=library target=libretro
     - mkdir libretro-nightly
     - cp -a higan/out/higan/out/higan_sfc_libretro.so higan-nightly/