Compare commits
2 Commits
fix/issue-
...
fix/issue-
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
591dcb4285 | ||
| ab99647193 |
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -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
|
||||||
:
|
:
|
||||||
|
|||||||
Reference in New Issue
Block a user