ommp

~ Oh My Music Player — a standalone terminal music player built with Rust and ratatui

git clone https://github.com/debuman/ommp.git

commit 19203c2b68db46a34653e4f2420abdc9fcca99be
parent dbf58134484d32b88e4011ba46730e85923e7b23
Author: sqzer <sqzer-x@users.noreply.github.com>
Date: Sat, 1 Aug 2026 21:50:07 +0900

Reset the deploy branch to the remote before building on it

GitHub commits to gh-pages itself whenever the Pages custom domain changes — it
wrote a Delete CNAME and a Create CNAME during the move to ommp.sqzer.com. The
deploy script fetched but checked out the local branch, which had not moved, so
the next deploy built on a fork and its push was rejected.

Diffstat:

site/tools/deploy.sh

++++++

1 file changed, 6 insertion(+), 0 deletion(-)

diff --git a/site/tools/deploy.sh b/site/tools/deploy.sh
@@ -17,6 +17,11 @@ sqzass doctor -i "$REPO/site"
 git -C "$REPO" worktree remove "$WORK" --force 2>/dev/null || true
 rm -rf "$WORK"
 git -C "$REPO" fetch origin gh-pages
+# Point the local branch at the remote before checking it out. GitHub writes its
+# own commits to this branch whenever the Pages custom domain is changed, so a
+# local ref that has not been moved forward will fork the history and the push
+# will be rejected.
+git -C "$REPO" branch -f gh-pages origin/gh-pages
 git -C "$REPO" worktree add "$WORK" gh-pages
 
 # Mirror rather than merge: files deleted from the site must disappear here too.
@@ -27,6 +32,7 @@ if git -C "$WORK" diff --cached --quiet; then
   echo "nothing changed"
 else
   git -C "$WORK" commit -q -m "Deploy the landing page"
+  # No -q, and no success message unless the push actually returned 0.
   git -C "$WORK" push origin gh-pages
   echo "published → https://ommp.sqzer.com/"
 fi