Worktree Workflow

.env

#!/usr/bin/env bash
set -euo pipefail

MESSAGE=${1:-}
if [[ -z "$MESSAGE" ]]; then
  echo "Usage: regular-commit.sh \"message describing why\""
  exit 1
fi

if [[ -z "$(git status --porcelain)" ]]; then
  echo "No changes to commit."
  exit 0
fi

git add -A
git commit -m "$MESSAGE"
git push -u origin HEAD

#!/usr/bin/env bash
set -euo pipefail

TASK_NAME=${1:-}
if [[ -z "$TASK_NAME" ]]; then
  echo "Usage: start-task-worktree.sh \"task-name\""
  exit 1
fi

BASE_BRANCH=${BASE_BRANCH:-main}
WORKTREES_DIR=${WORKTREES_DIR:-_worktrees}

SAFE_TASK_NAME=$(echo "$TASK_NAME" | tr '[:upper:]' '[:lower:]' | tr ' ' '-')
BRANCH_NAME="task/${SAFE_TASK_NAME}"
WORKTREE_PATH="${WORKTREES_DIR}/${SAFE_TASK_NAME}"

if git show-ref --verify --quiet "refs/heads/${BRANCH_NAME}"; then
  echo "Branch already exists: ${BRANCH_NAME}"
  exit 1
fi

if git show-ref --verify --quiet "refs/remotes/origin/${BASE_BRANCH}"; then
  BASE_REF="origin/${BASE_BRANCH}"
else
  BASE_REF="${BASE_BRANCH}"
fi

mkdir -p "${WORKTREES_DIR}"
git worktree add "${WORKTREE_PATH}" -b "${BRANCH_NAME}" "${BASE_REF}"

git -C "${WORKTREE_PATH}" submodule update --init --recursive

echo "Worktree created at ${WORKTREE_PATH} on ${BRANCH_NAME}"