shoko/kugetsu
1
0
Fork 0
Code Issues 17 Pull Requests Actions Packages Projects Releases 3 Wiki Activity

fix(queue-daemon): make base branch configurable via KUGETSU_BASE_BRANCH

Browse Source 
- Add KUGETSU_BASE_BRANCH env var (default: origin/main)
- Update check_task_completion() to use configurable base branch
- Update create_worktree() to use configurable base branch

Closes #165
This commit is contained in:
shokollm
2026-04-08 06:13:08 +00:00
parent ab99647193
commit 591dcb4285
3 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
skills/kugetsu/scripts/kugetsu-config.sh
View File

@@ -28,6 +28,7 @@ TASK_TIMEOUT_HOURS="${TASK_TIMEOUT_HOURS:-1}"
NETWORK_RETRY_ATTEMPTS="${NETWORK_RETRY_ATTEMPTS:-3}" NETWORK_RETRY_ATTEMPTS="${NETWORK_RETRY_ATTEMPTS:-3}"
NETWORK_RETRY_DELAY_SECONDS="${NETWORK_RETRY_DELAY_SECONDS:-5}" NETWORK_RETRY_DELAY_SECONDS="${NETWORK_RETRY_DELAY_SECONDS:-5}"
KUGETSU_BASE_BRANCH="${KUGETSU_BASE_BRANCH:-origin/main}"
# Load user config overrides (~/.kugetsu/config) # Load user config overrides (~/.kugetsu/config)
if [ -f "$KUGETSU_DIR/config" ]; then if [ -f "$KUGETSU_DIR/config" ]; then

4
skills/kugetsu/scripts/kugetsu-queue-daemon.sh
View File

@@ -75,7 +75,7 @@ check_task_completion() {
local has_commits=false local has_commits=false
if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then
if [ -n "$(git -C "$worktree_path" log --oneline origin/main..HEAD 2>/dev/null)" ]; then if [ -n "$(git -C "$worktree_path" log --oneline "$KUGETSU_BASE_BRANCH..HEAD" 2>/dev/null)" ]; then
has_commits=true has_commits=true
fi fi
fi fi
@@ -95,7 +95,7 @@ check_task_completion() {
local has_commits=false local has_commits=false
if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then if [ -d "$worktree_path" ] && [ -d "$worktree_path/.git" ]; then
if [ -n "$(git -C "$worktree_path" log --oneline origin/main..HEAD 2>/dev/null)" ]; then if [ -n "$(git -C "$worktree_path" log --oneline "$KUGETSU_BASE_BRANCH..HEAD" 2>/dev/null)" ]; then
has_commits=true has_commits=true
fi fi
fi fi

2
skills/kugetsu/scripts/kugetsu-worktree.sh
View File

@@ -109,7 +109,7 @@ create_worktree() {
fi fi
echo "Creating branch '$branch_name'..." echo "Creating branch '$branch_name'..."
if git -C "$worktree_path" checkout -b "$branch_name" origin/main 2>/dev/null; then if git -C "$worktree_path" checkout -b "$branch_name" "$KUGETSU_BASE_BRANCH" 2>/dev/null; then
: :
elif git -C "$worktree_path" checkout -b "$branch_name" main 2>/dev/null; then elif git -C "$worktree_path" checkout -b "$branch_name" main 2>/dev/null; then
: :