From bb843582cac721b1a478c6dc12dafee1edbd73e4 Mon Sep 17 00:00:00 2001
From: Aidan Hobson Sayers <aidanhs@cantab.net>
Date: Sat, 8 Apr 2017 08:39:31 +0100
Subject: [PATCH] Add a comment for disabling errexit

---
 appveyor.yml        | 3 +--
 src/ci/init_repo.sh | 2 ++
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/appveyor.yml b/appveyor.yml
index 9070c5d9edf1e..978ca0d9739b1 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -148,8 +148,7 @@ test_script:
   - sh src/ci/run.sh
 
 on_failure:
-  - cat %CD%\sccache.log
-  - cat C:\Users\appveyor\AppData\Local\Temp\1\build-cache-logs\*.log
+  - cat %CD%\sccache.log || exit 0
 
 cache:
   - C:\cache\rustsrc
diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh
index 633b88dd2c42f..1db2135eb6d86 100755
--- a/src/ci/init_repo.sh
+++ b/src/ci/init_repo.sh
@@ -41,6 +41,8 @@ if [ ! -f "$cache_valid_file" ]; then
     rm -rf "$CACHE_DIR"
     mkdir "$CACHE_DIR"
 else
+    # Ignore errors while gathering information about the possible brokenness
+    # of the git repo since our gathered info will tell us something is wrong
     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 $?)