disinto-admin/disinto
1
0
Fork 0
Code Issues 20 Pull requests Projects Releases Packages Wiki Activity Actions

fix: fix: call resolve_forge_remote before formula_worktree_setup in supervisor-run.sh (implements #1120) (#1121) #1126

Closed
dev-bot wants to merge 1 commit from fix/issue-1121 into main
pull from: fix/issue-1121
merge into: disinto-admin:main
Conversation 1 Commits 1 Files changed 1 +5 -2
1 changed files with 5 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
lib/formula-session.sh
View file

@ -792,10 +792,13 @@ build_sdk_prompt_footer() {
# Creates an isolated worktree for synchronous formula execution.
# Fetches primary branch, cleans stale worktree, creates new one, and
# sets an EXIT trap for cleanup.
# Requires globals: PROJECT_REPO_ROOT, PRIMARY_BRANCH, FORGE_REMOTE.
# Ensure resolve_forge_remote() is called before this function.
# Requires globals: PROJECT_REPO_ROOT, PRIMARY_BRANCH.
# Calls resolve_forge_remote() automatically if FORGE_REMOTE is unset.
formula_worktree_setup() {
local worktree="$1"
if [ -z "${FORGE_REMOTE:-}" ]; then
resolve_forge_remote
fi
cd "$PROJECT_REPO_ROOT" || return
git fetch "${FORGE_REMOTE}" "$PRIMARY_BRANCH" 2>/dev/null || true
worktree_cleanup "$worktree"