Skip to content

Support launching the devcontainer from a git worktree #8950

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

Open
alliepiper wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Support launching the devcontainer from a git worktree #8950

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56009f4
[devcontainer] Support launching from a git worktree
alliepiper May 12, 2026
78a9efa
Merge branch 'main' into devcontainer-worktree-fix
alliepiper May 13, 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
46 changes: 46 additions & 0 deletions .devcontainer/launch.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,52 @@ launch_docker() {
# shellcheck disable=SC2312,SC1090
source <(python3 .devcontainer/launch.py "${path}/devcontainer.json")

###
# Worktree support
###

# In a linked git worktree, `.git` is a file containing
# gitdir: <main-repo>/.git/worktrees/<name>
# an absolute host path. The container only mounts the worktree at
# /home/coder/cccl, so that gitdir path (and the main .git it links
# back to via commondir) is unreachable, and every git operation in
# the container fails. Bind-mount the main .git at its host path so
# both the absolute gitdir pointer and the relative commondir
# resolve inside the container.
if [[ -f .git ]]; then
local git_common_dir
git_common_dir="$(cd "$(git rev-parse --git-common-dir)" && pwd)"
MOUNTS+=(--mount "source=${git_common_dir},target=${git_common_dir},type=bind")

# The devcontainer mounts ${localWorkspaceFolder}/.config to
# /home/coder/.config, which in a fresh worktree has no gh/ subdir,
# so devcontainer-utils-init-git triggers an interactive
# `gh auth login` device flow on startup. Share the main checkout's
# .config/gh (where the host's gh auth lives, populated by prior
# main-checkout container runs) so init-git skips the device flow.
local main_repo
main_repo="$(cd "${git_common_dir}/.." && pwd)"
local main_gh_config="${main_repo}/.config/gh"
local gh_auth_shared=false
if [[ -d "${main_gh_config}" ]]; then
MOUNTS+=(--mount "source=${main_gh_config},target=/home/coder/.config/gh,type=bind")
gh_auth_shared=true
Comment thread
coderabbitai[bot] marked this conversation as resolved.
fi

echo "warning: launching from a git worktree." >&2
echo " The 'cccl-build' and 'cccl-wheelhouse' docker volumes are" >&2
echo " shared across all worktrees and the main checkout, so build" >&2
echo " artifacts will collide between them. Avoid running multiple" >&2
echo " worktree devcontainers concurrently." >&2
if ! ${gh_auth_shared}; then
echo " The main checkout has no .config/gh/ to share, so" >&2
echo " devcontainer-utils-init-git will block on an interactive" >&2
echo " 'gh auth login' device flow. Launch the main checkout's" >&2
echo " devcontainer once and complete the gh login there to" >&2
echo " persist auth state, then re-launch this worktree." >&2
fi
fi

###
# Run the initialize command(s) before starting the container
###
Expand Down
Loading