From 9ced76757869e091a39e22e4c79aab3e4b33dcd6 Mon Sep 17 00:00:00 2001
From: Erich Eckner <git@eckner.net>
Date: Tue, 12 Jun 2018 09:05:22 +0200
Subject: lib/load-configuration: do not fail on failing "git pull" (race
 conditions)

---
 lib/load-configuration | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/load-configuration b/lib/load-configuration
index 7f9ba28..9df76eb 100755
--- a/lib/load-configuration
+++ b/lib/load-configuration
@@ -150,5 +150,6 @@ fi
 
 # check out newest revision
 if git -C "${base_dir}" status >/dev/null 2>&1; then
-  git -C "${base_dir}" pull --ff-only
+  git -C "${base_dir}" pull --ff-only || \
+    true
 fi
-- 
cgit v1.2.3