[pull] trunk from cli:trunk

acceptance/testdata/pr/pr-checkout-worktree-detach.txtar

@@ -0,0 +1,56 @@
+# Checkout a PR into a worktree with a detached HEAD, then reuse that worktree.
+
+# Set up env vars
+env REPO=${SCRIPT_NAME}-${RANDOM_STRING}
+
+# Use gh as a credential helper
+exec gh auth setup-git
+
+# Create a repository with a file so it has a default branch
+exec gh repo create ${ORG}/${REPO} --add-readme --private
+
+# Defer repo cleanup
+defer gh repo delete --yes ${ORG}/${REPO}
+
+# Clone the repo
+exec gh repo clone ${ORG}/${REPO}
+
+# Prepare a branch to PR
+cd ${REPO}
+exec git checkout -b feature-branch
+exec git commit --allow-empty -m 'Empty Commit'
+exec git push -u origin feature-branch
+
+# Create the PR
+exec gh pr create --title 'Feature Title' --body 'Feature Body'
+stdout2env PR_URL
+
+# Return to the default branch
+exec git checkout main
+
+# Checkout the PR into a fresh worktree with a detached HEAD
+exec gh pr checkout ${PR_URL} --detach --worktree ../wt
+exists ../wt
+
+# The worktree HEAD is detached, so it has no symbolic ref
+! exec git -C ../wt symbolic-ref -q HEAD
+
+# The detached HEAD points at the PR head commit
+exec git -C ../wt rev-parse HEAD
+stdout2env WT_HEAD
+exec git rev-parse origin/feature-branch
+stdout ${WT_HEAD}
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Checking out again into the same worktree reuses it and stays detached
+exec gh pr checkout ${PR_URL} --detach --worktree ../wt
+! exec git -C ../wt symbolic-ref -q HEAD
+exec git -C ../wt rev-parse HEAD
+stdout ${WT_HEAD}
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'

acceptance/testdata/pr/pr-checkout-worktree-from-fork.txtar

@@ -0,0 +1,55 @@
+# Checkout a fork PR whose head repository is not configured as a remote into a
+# worktree, then reuse that worktree.
+
+# Set up env vars
+env REPO=${SCRIPT_NAME}-${RANDOM_STRING}
+
+# Use gh as a credential helper
+exec gh auth setup-git
+
+# Create a repository with a file so it has a default branch
+exec gh repo create ${ORG}/${REPO} --add-readme --private
+
+# Defer upstream cleanup
+defer gh repo delete --yes ${ORG}/${REPO}
+
+# Create a fork
+exec gh repo fork ${ORG}/${REPO} --org ${ORG} --fork-name ${REPO}-fork
+sleep 5
+
+# Defer fork cleanup
+defer gh repo delete --yes ${ORG}/${REPO}-fork
+
+# Clone both repos
+exec gh repo clone ${ORG}/${REPO}
+exec gh repo clone ${ORG}/${REPO}-fork
+
+# Prepare a branch to PR in the fork itself
+cd ${REPO}-fork
+exec git checkout -b feature-branch
+exec git commit --allow-empty -m 'Empty Commit'
+exec git push -u origin feature-branch
+
+exec gh repo set-default ${ORG}/${REPO}-fork
+exec gh pr create --title 'Feature Title' --body 'Feature Body'
+stdout2env PR_URL
+
+# From the upstream clone, where the fork is not a remote, check out the PR into a worktree
+cd ${WORK}/${REPO}
+exec gh pr checkout ${PR_URL} --worktree ../wt
+exists ../wt
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Reusing the same worktree for the same fork PR works
+exec gh pr checkout ${PR_URL} --worktree ../wt
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'

acceptance/testdata/pr/pr-checkout-worktree.txtar

@@ -0,0 +1,135 @@
+# Checkout a PR into a git worktree, then reuse that worktree, rename its branch,
+# force sync it, and add a second worktree once the local branch already exists.
+
+# Set up env vars
+env REPO=${SCRIPT_NAME}-${RANDOM_STRING}
+
+# Use gh as a credential helper
+exec gh auth setup-git
+
+# Create a repository with a file so it has a default branch
+exec gh repo create ${ORG}/${REPO} --add-readme --private
+
+# Defer repo cleanup
+defer gh repo delete --yes ${ORG}/${REPO}
+
+# Clone the repo
+exec gh repo clone ${ORG}/${REPO}
+
+# Prepare a branch to PR
+cd ${REPO}
+exec git checkout -b feature-branch
+exec git commit --allow-empty -m 'Empty Commit'
+exec git push -u origin feature-branch
+
+# Create the PR
+exec gh pr create --title 'Feature Title' --body 'Feature Body'
+stdout2env PR_URL
+
+# Remove the local branch so checkout has to create it from the remote
+exec git checkout main
+exec git branch -D feature-branch
+stdout 'Deleted branch feature-branch'
+
+# Checkout the PR into a fresh worktree
+exec gh pr checkout ${PR_URL} --worktree ../wt
+exists ../wt
+
+# The worktree is on the PR branch
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The main working copy stays on the default branch
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Checking out the same PR into the same worktree again reuses it
+exec gh pr checkout ${PR_URL} --worktree ../wt
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Checking out into the reused worktree with a new branch name creates that branch
+exec gh pr checkout ${PR_URL} --worktree ../wt --branch renamed-branch
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^renamed-branch$'
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Give the worktree's PR branch a local commit so it diverges from the PR head.
+# A plain reuse would fast-forward-only merge and keep this commit, so --force is
+# required to discard it with a hard reset.
+exec git -C ../wt checkout feature-branch
+exec git -C ../wt commit --allow-empty -m 'Diverging local commit'
+
+# Force checking out the PR into the reused worktree hard resets it to the PR head
+exec gh pr checkout ${PR_URL} --worktree ../wt --force
+exec git -C ../wt rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The diverging local commit was discarded by the hard reset
+exec git -C ../wt log -1 --format=%s
+! stdout 'Diverging local commit'
+
+# The worktree branch now matches the PR head
+exec git -C ../wt rev-parse HEAD
+stdout2env WT_HEAD
+exec git rev-parse origin/feature-branch
+stdout ${WT_HEAD}
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# With the local branch now present, removing the worktree and checking out into a
+# fresh path adds a new worktree for the existing branch
+exec git worktree remove ../wt
+exec gh pr checkout ${PR_URL} --worktree ../wt2
+exists ../wt2
+exec git -C ../wt2 rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'
+
+# Now create a two-sided divergence: advance the remote PR branch with a pushed
+# commit the local branch will not have...
+exec git -C ../wt2 commit --allow-empty -m 'Remote commit'
+exec git -C ../wt2 push origin feature-branch
+
+# ...then rewind the local branch and give it a different, local-only commit, so
+# neither branch is an ancestor of the other
+exec git -C ../wt2 reset --hard HEAD~1
+exec git -C ../wt2 commit --allow-empty -m 'Local commit'
+
+# A non-force checkout cannot fast-forward across the divergence and fails
+! exec gh pr checkout ${PR_URL} --worktree ../wt2
+stderr 'Not possible to fast-forward'
+
+# The local-only commit is still there because the failed sync changed nothing
+exec git -C ../wt2 log -1 --format=%s
+stdout 'Local commit'
+
+# Forcing the checkout hard resets the branch to the advanced PR head
+exec gh pr checkout ${PR_URL} --worktree ../wt2 --force
+exec git -C ../wt2 rev-parse --abbrev-ref HEAD
+stdout '(?m)^feature-branch$'
+exec git -C ../wt2 log -1 --format=%s
+stdout 'Remote commit'
+! stdout 'Local commit'
+
+# The worktree branch now matches the advanced PR head
+exec git -C ../wt2 rev-parse HEAD
+stdout2env WT2_HEAD
+exec git rev-parse origin/feature-branch
+stdout ${WT2_HEAD}
+
+# The main working copy is left untouched
+exec git rev-parse --abbrev-ref HEAD
+stdout '(?m)^main$'