From d3d93a61b7e7ff77298f1bda53e0653ded06a6ce Mon Sep 17 00:00:00 2001
From: Timothy Kim <timothykim@fastmail.fm>
Date: Fri, 13 Mar 2026 13:12:08 -0400
Subject: [PATCH] move git checkout before git-crypt unlock

git-crypt refuses to unlock if the working directory is dirty.
---
 setup.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/setup.sh b/setup.sh
index fc46e0a..7451d49 100644
--- a/setup.sh
+++ b/setup.sh
@@ -42,6 +42,9 @@ fi
 
 # --- Unlock git-crypt via Bitwarden ---
 
+echo "==> Restoring git-tracked files..."
+cd "$REPO_DIR" && git checkout -- .
+
 echo "==> Unlocking git-crypt via Bitwarden..."
 echo "    Log in to Bitwarden when prompted."
 if bw status 2>/dev/null | grep -q '"status":"unauthenticated"'; then
@@ -91,9 +94,6 @@ chmod +x "$REPO_DIR/scripts/"*.sh
 echo "==> Logging into Gitea registry..."
 echo "Run manually: docker login git.timothykim.net"
 
-echo "==> Restoring git-tracked files..."
-cd "$REPO_DIR" && git checkout -- .
-
 echo "==> Starting services..."
 cd "$REPO_DIR/docker/nginx" && docker compose up -d
 cd "$REPO_DIR/docker/timothykim.net" && docker compose up -d