diff options
| author | Erich Eckner <git@eckner.net> | 2018-06-12 09:05:22 +0200 |
|---|---|---|
| committer | Erich Eckner <git@eckner.net> | 2018-06-12 09:05:22 +0200 |
| commit | 9ced76757869e091a39e22e4c79aab3e4b33dcd6 (patch) | |
| tree | 4b78a86dcf1032727c4ac0ca48ec0acbb7e21ad2 | |
| parent | 87424c9030507d0b21fdb44fcc84b3562f9a42bc (diff) | |
| download | builder-9ced76757869e091a39e22e4c79aab3e4b33dcd6.tar.xz | |
lib/load-configuration: do not fail on failing "git pull" (race conditions)
| -rwxr-xr-x | lib/load-configuration | 3 |
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 |