Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-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