From 84a4e64bf1abbce4bb80fdef580a9ec2155a410b Mon Sep 17 00:00:00 2001 From: "Rai (Michael Pokorny)" Date: Tue, 24 Jun 2025 13:39:21 -0700 Subject: [PATCH] tasks: branch new worktrees off agentydragon instead of master --- agentydragon/README.md | 2 +- agentydragon/tasks/create-task-worktree.sh | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/agentydragon/README.md b/agentydragon/README.md index 756e08a97d..953cd5ccd3 100644 --- a/agentydragon/README.md +++ b/agentydragon/README.md @@ -32,7 +32,7 @@ Tasks live under `agentydragon/tasks/` as individual Markdown files. Please upda - ``` - - Without `--agent`, this creates or reuses a worktree at -- `agentydragon/tasks/.worktrees/-` off the `master` branch. +- `agentydragon/tasks/.worktrees/-` off the `agentydragon` branch. - With `--agent`, after setup it launches a Codex agent in that workspace, - preloaded to work on the specified task from its Markdown file. diff --git a/agentydragon/tasks/create-task-worktree.sh b/agentydragon/tasks/create-task-worktree.sh index 1ace9a20ee..a6bb7a2f68 100755 --- a/agentydragon/tasks/create-task-worktree.sh +++ b/agentydragon/tasks/create-task-worktree.sh @@ -44,14 +44,15 @@ mkdir -p "$worktrees_dir" # Create branch if it does not exist if ! git show-ref --verify --quiet "refs/heads/$branch"; then - echo "Creating branch $branch from master..." - git branch --track "$branch" master + echo "Creating branch $branch from agentydragon branch..." + git branch --track "$branch" agentydragon fi # Create worktree if it does not exist if [ ! -d "$worktree_path" ]; then echo "Creating worktree for $branch at $worktree_path" git worktree add "$worktree_path" "$branch" + else echo "Worktree for $branch already exists at $worktree_path" fi