Skip to content

fix: copy to every registered worktree with --all #249

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shiqui merged 3 commits into from
Nov 6, 2026
Merged

fix: copy to every registered worktree with --all #249

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
03e4144
fix: preserve exact worktree identities in copy --all
shiqui Nov 5, 2026
d9482b6
test: support Git 2.17 in copy and resolver fixtures
shiqui Nov 5, 2026
3561df4
fix: fail copy --all when no worktree resolves
shiqui Nov 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 36 additions & 9 deletions lib/commands/copy.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,30 +68,52 @@ cmd_copy() {

# Build target list for --all mode
if [ "$all_mode" -eq 1 ]; then
local all_branches
all_branches=$(list_worktree_branches "$base_dir" "$prefix" "$repo_root")
if [ -z "$all_branches" ]; then
local records line is_main="" found_worktree=0
records=$(list_worktree_records "$repo_root") || exit 1
# Branch names cannot distinguish duplicate checkouts or detached HEADs.
# Keep paths escaped until resolve_worktree validates each exact identity.
while IFS= read -r line; do
case "$line" in
"is_main "*) is_main="${line#is_main }" ;;
"path "*)
if [ "$is_main" = "0" ]; then
targets+=("path:${line#path }")
found_worktree=1
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
fi
;;
esac
done <<< "$records"
if [ "$found_worktree" -eq 0 ]; then
log_error "No worktrees found"
exit 1
fi
local _branch
while IFS= read -r _branch; do
[ -n "$_branch" ] && targets+=("$_branch")
done <<< "$all_branches"
fi

# Process each target
local copied_any=0
local target_id
local copied_any=0 resolved_worktree=0
local target_id processed_path
local -a processed_paths=()
for target_id in "${targets[@]}"; do
local dst_path dst_branch
resolve_worktree "$target_id" "$repo_root" "$base_dir" "$prefix" || continue

dst_path="$_ctx_worktree_path" dst_branch="$_ctx_branch"

# Count resolved non-main targets before excluding the source so a
# source-only --all remains a valid no-op.
[ "$_ctx_is_main" = "0" ] && resolved_worktree=1

# Skip if source == destination
[ "$src_path" = "$dst_path" ] && continue

# Explicit targets can overlap --all, including via branch/folder aliases.
if [ "$all_mode" -eq 1 ]; then
for processed_path in "${processed_paths[@]}"; do
[ "$dst_path" = "$processed_path" ] && continue 2
done
processed_paths+=("$dst_path")
fi

if [ "$dry_run" -eq 1 ]; then
log_step "[dry-run] Would copy to: $dst_branch"
if [ -n "$patterns" ]; then
Expand All @@ -112,6 +134,11 @@ cmd_copy() {
copied_any=1
done

if [ "$all_mode" -eq 1 ] && [ "$resolved_worktree" -eq 0 ]; then
log_error "No worktrees found"
return 1
fi

if [ "$copied_any" -eq 0 ]; then
log_warn "No files copied (source and target may be the same)"
fi
Expand Down
231 changes: 230 additions & 1 deletion tests/cmd_copy.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,9 +185,238 @@ teardown() {
[ -f "$TEST_WORKTREES_DIR/copy-target-2/.env" ]
}

@test "copy --all copies each registered checkout once including duplicate branches and detached HEAD" {
local duplicate="$TEST_WORKTREES_DIR/nested/duplicate"
local detached="$TEST_WORKTREES_DIR/detached"
local external="$(cd "$BATS_TEST_TMPDIR" && pwd -P)/external checkout"
git worktree add --force "$duplicate" copy-target
git worktree add --detach "$detached" HEAD
# A linked checkout of the main branch must not resolve back to the source.
git worktree add --force "$external" "$(get_current_branch "$TEST_REPO")"
mkdir -p "$TEST_WORKTREES_DIR/stray"

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env

[ "$status" -eq 0 ]
local path
for path in "$TEST_WT_PATH" "$duplicate" "$detached" "$external"; do
[ "$(cat "$path/.env")" = "secret=value" ]
done
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 4 ]
[ ! -e "$TEST_WORKTREES_DIR/nested/.env" ]
[ ! -e "$TEST_WORKTREES_DIR/stray/.env" ]
}

@test "copy --all succeeds when the only linked worktree is detached" {
git worktree remove "$TEST_WT_PATH"
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env

[ "$status" -eq 0 ]
[ "$(cat "$detached/.env")" = "secret=value" ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 1 ]
}

@test "copy --all --from skips only the source checkout of a shared branch" {
local duplicate="$TEST_WORKTREES_DIR/duplicate"
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --force "$duplicate" copy-target
git worktree add --detach "$detached" HEAD
echo 'source=value' > "$TEST_WT_PATH/.env"

run "$PROJECT_ROOT/bin/gtr" copy --all --from copy-target -- .env

[ "$status" -eq 0 ]
[ "$(cat "$duplicate/.env")" = 'source=value' ]
[ "$(cat "$detached/.env")" = 'source=value' ]
[ "$(cat "$TEST_WT_PATH/.env")" = 'source=value' ]
[ "$(cat "$TEST_REPO/.env")" = 'secret=value' ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 2 ]
}

@test "copy --all accepts a detached source and deduplicates overlapping explicit targets" {
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD
echo 'source=value' > "$detached/.env"

run "$PROJECT_ROOT/bin/gtr" copy 1 copy-target "path:$TEST_WT_PATH" \
--all --from "path:$detached" -- .env

[ "$status" -eq 0 ]
[ "$(cat "$TEST_WT_PATH/.env")" = 'source=value' ]
[ "$(cat "$TEST_REPO/.env")" = 'source=value' ]
[ "$(cat "$detached/.env")" = 'source=value' ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 2 ]
}

@test "copy --all preserves escaped path characters with old Git listing fallback" {
local path="$TEST_WORKTREES_DIR/\"quotes\" café \\n \\t \$(touch should-not-exist)"$'\t'
git worktree add --detach "$path" HEAD
git() {
case "$*" in *"worktree list --porcelain -z") return 1 ;; esac
command git "$@"
}

run cmd_copy --all -- .env

[ "$status" -eq 0 ]
[ "$(cat "$path/.env")" = 'secret=value' ]
[ "$(cat "$TEST_WT_PATH/.env")" = 'secret=value' ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 2 ]
[ ! -e "$TEST_REPO/should-not-exist" ]
}

@test "copy --all keeps literal escapes and trailing newlines in distinct registered paths" {
if ! git worktree list --porcelain -z >/dev/null 2>&1; then
skip "git worktree list --porcelain -z is not available"
fi
local newline_path="$TEST_WORKTREES_DIR/line"$'\n'
local literal_path="$TEST_WORKTREES_DIR/line\\n"
git worktree add --detach "$newline_path" HEAD
git worktree add --detach "$literal_path" HEAD

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env

[ "$status" -eq 0 ]
[ "$(cat "$newline_path/.env")" = 'secret=value' ]
[ "$(cat "$literal_path/.env")" = 'secret=value' ]
[ "$(cat "$TEST_WT_PATH/.env")" = 'secret=value' ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 3 ]
[ ! -e "$TEST_WORKTREES_DIR/line/.env" ]
}

@test "copy --all dry-run and configured patterns cover each duplicate and detached checkout once" {
local duplicate="$TEST_WORKTREES_DIR/duplicate"
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --force "$duplicate" copy-target
git worktree add --detach "$detached" HEAD
mkdir -p "$TEST_REPO/vendor/cache"
echo settings > "$TEST_REPO/vendor/settings.json"
echo excluded > "$TEST_REPO/vendor/token.pem"
echo excluded > "$TEST_REPO/vendor/cache/data"
echo excluded > "$TEST_REPO/.env.private"
git config gtr.copy.include '.env*'
git config --add gtr.copy.exclude '.env.private'
git config --add gtr.copy.exclude '*.pem'
git config gtr.copy.includeDirs vendor/
git config gtr.copy.excludeDirs vendor/cache

run "$PROJECT_ROOT/bin/gtr" copy copy-target --all --dry-run

[ "$status" -eq 0 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Would copy 1 file(s)')" -eq 3 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Would copy 1 directories')" -eq 3 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Would copy to: copy-target')" -eq 2 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Would copy to: (detached)')" -eq 1 ]
local path
for path in "$TEST_WT_PATH" "$duplicate" "$detached"; do
[ ! -e "$path/.env" ]
[ ! -e "$path/vendor" ]
done

run "$PROJECT_ROOT/bin/gtr" copy copy-target --all

[ "$status" -eq 0 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 3 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 directories')" -eq 3 ]
for path in "$TEST_WT_PATH" "$duplicate" "$detached"; do
[ "$(cat "$path/.env")" = 'secret=value' ]
[ "$(cat "$path/vendor/settings.json")" = settings ]
[ ! -e "$path/.env.private" ]
[ ! -e "$path/vendor/token.pem" ]
[ ! -e "$path/vendor/cache" ]
done
}

@test "copy --all propagates copy failures in detached worktrees" {
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD
mkdir "$detached/.env"

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env

[ "$status" -eq 1 ]
[[ "$output" == *"Failed to copy .env"* ]]
[ -d "$detached/.env" ]
[ ! -e "$detached/.env/.env" ]
}

@test "copy --all fails when only unregistered directories remain" {
git worktree remove "$TEST_WT_PATH"
mkdir "$TEST_WORKTREES_DIR/stray"

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env

[ "$status" -eq 1 ]
[[ "$output" == *"No worktrees found"* ]]
[ ! -e "$TEST_WORKTREES_DIR/stray/.env" ]
}

@test "copy --all fails when its only registered detached worktree is missing" {
git worktree remove "$TEST_WT_PATH"
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD
rm -rf "$detached"

run cmd_copy --all -- .env
[ "$status" -eq 1 ]
[[ "$output" == *"No worktrees found"* ]]

run "$PROJECT_ROOT/bin/gtr" copy --all --dry-run -- .env
[ "$status" -eq 1 ]
[[ "$output" == *"No worktrees found"* ]]
[ ! -e "$detached" ]
}

@test "copy --all fails when a missing attached worktree and explicit main source are its only targets" {
rm -rf "$TEST_WT_PATH"

run "$PROJECT_ROOT/bin/gtr" copy 1 --all -- .env

[ "$status" -eq 1 ]
[[ "$output" == *"No worktrees found"* ]]
[ "$(cat "$TEST_REPO/.env")" = 'secret=value' ]
[ ! -e "$TEST_WT_PATH" ]
}

@test "copy --all succeeds for a live destination alongside a missing worktree" {
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD
rm -rf "$detached"

run "$PROJECT_ROOT/bin/gtr" copy --all --dry-run -- .env
[ "$status" -eq 0 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Would copy 1 file(s)')" -eq 1 ]
[ ! -e "$TEST_WT_PATH/.env" ]
[ ! -e "$detached" ]

run "$PROJECT_ROOT/bin/gtr" copy --all -- .env
[ "$status" -eq 0 ]
[ "$(printf '%s\n' "$output" | grep -cF 'Copied 1 file(s)')" -eq 1 ]
[ "$(cat "$TEST_WT_PATH/.env")" = 'secret=value' ]
[ ! -e "$detached" ]
}

@test "copy --all remains a successful no-op when only its source worktree resolves" {
local detached="$TEST_WORKTREES_DIR/detached"
git worktree add --detach "$detached" HEAD
rm -rf "$detached"
echo 'source=value' > "$TEST_WT_PATH/.env"

run "$PROJECT_ROOT/bin/gtr" copy --all --from copy-target -- .env

[ "$status" -eq 0 ]
[[ "$output" == *"No files copied"* ]]
[ "$(cat "$TEST_WT_PATH/.env")" = 'source=value' ]
[ "$(cat "$TEST_REPO/.env")" = 'secret=value' ]
[ ! -e "$detached" ]
}

@test "cmd_copy --all copies to nested registered worktree only" {
mkdir -p "$TEST_WORKTREES_DIR/jsmith"
git -C "$TEST_REPO" worktree add "$TEST_WORKTREES_DIR/jsmith/my-feature" -b jsmith/my-feature --quiet
git -C "$TEST_REPO" worktree add "$TEST_WORKTREES_DIR/jsmith/my-feature" -b jsmith/my-feature

run cmd_copy --all -- ".env"
[ "$status" -eq 0 ]
Expand Down
Loading
Loading