make sure we get clean checkouts

2023-01-30 14:12:13 +01:00 · 2023-01-30 14:12:13 +01:00 · 4601e0bf08
parent 582cb8a691
commit 4601e0bf08
1 changed files with 2 additions and 1 deletions
--- a/global/post-tasks.d/018packages
+++ b/global/post-tasks.d/018packages
@ -42,7 +42,8 @@ if [ -f $CONFIG -o $LOCALCONFIG ]; then
            if [ "$src" != "$(git config remote.origin.url)" ]; then
              git config remote.origin.url $src
            fi
-            git pull -q
+            # Update repo and clean out any local inconsistencies
+            git pull -q || (git fetch && git reset --hard)
          else
            continue
          fi