From 932c084d3169eb477dcb22d533d0062cdd9574f6 Mon Sep 17 00:00:00 2001
From: Benjamin Shafii <benjamin.shafii@gmail.com>
Date: Sun, 15 Feb 2026 19:25:16 -0800
Subject: [PATCH] fix(ci): keep a stable fork-sync branch

---
 .github/workflows/fork-sync-upstream.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/fork-sync-upstream.yml b/.github/workflows/fork-sync-upstream.yml
index cca603eac293..776c95c4f250 100644
--- a/.github/workflows/fork-sync-upstream.yml
+++ b/.github/workflows/fork-sync-upstream.yml
@@ -67,9 +67,10 @@ jobs:
         id: prep
         run: |
           set -euo pipefail
-          stamp="$(date -u +%Y%m%d-%H%M%S)"
           upstream_sha="$(git rev-parse --short "upstream/${UPSTREAM_BRANCH}")"
-          sync_branch="sync/${UPSTREAM_BRANCH}-${stamp}-${upstream_sha}"
+          safe_patch="$(echo "${PATCH_BRANCH}" | tr '/' '-')"
+          safe_upstream="$(echo "${UPSTREAM_BRANCH}" | tr '/' '-')"
+          sync_branch="sync/${safe_patch}-onto-${safe_upstream}"
           git checkout -B "$sync_branch" "origin/${PATCH_BRANCH}"
           echo "sync_branch=$sync_branch" >> "$GITHUB_OUTPUT"
           echo "upstream_sha=$upstream_sha" >> "$GITHUB_OUTPUT"