Rollup merge of #41135 - japaric:unstable-docs, r=steveklabnik

[rust.git] / src / ci / init_repo.sh

diff --git a/src/ci/init_repo.sh b/src/ci/init_repo.sh
index 4e22907d9794c733251fa1ad0a79679b47b14f57..633b88dd2c42facd2f9b90fd55a0a7a7e0dc408a 100755 (executable)
--- a/src/ci/init_repo.sh
+++ b/src/ci/init_repo.sh
@@ -38,9 +38,22 @@ fi
 
 # Wipe the cache if it's not valid, or mark it as invalid while we update it
 if [ ! -f "$cache_valid_file" ]; then
-    rm -rf "$CACHE_DIR" && mkdir "$CACHE_DIR"
+    rm -rf "$CACHE_DIR"
+    mkdir "$CACHE_DIR"
 else
-    rm "$cache_valid_file"
+    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 $?)
+    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
+        echo "WARNING: $cache_valid_file exists but bad repo: l:$stat_lines, ec:$stat_ec"
+        rm -rf "$CACHE_DIR"
+        mkdir "$CACHE_DIR"
+    else
+        rm "$cache_valid_file"
+    fi
 fi
 
 # Update the cache (a pristine copy of the rust source master)