Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorErich Eckner <git@eckner.net>2018-06-12 09:05:22 +0200
committerErich Eckner <git@eckner.net>2018-06-12 09:05:22 +0200
commit9ced76757869e091a39e22e4c79aab3e4b33dcd6 (patch)
tree4b78a86dcf1032727c4ac0ca48ec0acbb7e21ad2 /lib
parent87424c9030507d0b21fdb44fcc84b3562f9a42bc (diff)
lib/load-configuration: do not fail on failing "git pull" (race conditions)
Diffstat (limited to 'lib')
-rwxr-xr-xlib/load-configuration3
1 files changed, 2 insertions, 1 deletions
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