diff options
| author | Aidan Hobson Sayers <aidanhs@cantab.net> | 2017-04-07 19:55:52 +0100 |
|---|---|---|
| committer | Aidan Hobson Sayers <aidanhs@cantab.net> | 2017-04-07 20:15:02 +0100 |
| commit | bd4f3815eb3f6339f6f0a97894e8b1766df25ea0 (patch) | |
| tree | b39e954a94b16e87972181ecfccd3532e8a7272b /src/ci | |
| parent | b970bc2a79719b5c1573fb87c96773ce131dbb8d (diff) | |
| download | rust-bd4f3815eb3f6339f6f0a97894e8b1766df25ea0.tar.gz rust-bd4f3815eb3f6339f6f0a97894e8b1766df25ea0.zip | |
Disable errexit for sanity checking git repo
Diffstat (limited to 'src/ci')
| -rwxr-xr-x | src/ci/init_repo.sh | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh index c235681cddd..633b88dd2c4 100755 --- a/src/ci/init_repo.sh +++ b/src/ci/init_repo.sh @@ -41,8 +41,10 @@ if [ ! -f "$cache_valid_file" ]; then rm -rf "$CACHE_DIR" mkdir "$CACHE_DIR" else + set +o errexit stat_lines=$(cd "$cache_src_dir" && git status --porcelain | wc -l) - stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1 && echo $?) + stat_ec=$(cd "$cache_src_dir" && git status >/dev/null 2>&1; echo $?) + set -o errexit if [ ! -d "$cache_src_dir/.git" -o $stat_lines != 0 -o $stat_ec != 0 ]; then # Something is badly wrong - the cache valid file is here, but something # about the git repo is fishy. Nuke it all, just in case |