Skip to content

Feature: Allow git to work even when in a repo subdir #87

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
jeff-phil wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Feature: Allow git to work even when in a repo subdir #87

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2a4fa1d
Feat: Allow git to work even when in a repo subdir
jeff-phil May 5, 2026
950ca75
Changes based on PR feedback from maintainer
jeff-phil May 16, 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
25 changes: 25 additions & 0 deletions tasks/pi/_docker_flags
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -135,3 +135,28 @@ if [[ -n "${PI_SSH_AGENT:-}" ]]; then
echo "warning: PI_SSH_AGENT=1 but SSH_AUTH_SOCK is not set or is not a socket — SSH agent forwarding disabled" >&2
fi
fi

# PI_PARENT_GIT_MOUNT=1: mount the repo's common .git dir when pi is launched
# from a subdirectory or a separate worktree. Sets GIT_DIR and GIT_WORK_TREE
# inside the container so git commands work correctly. The .git dir is always
# mounted read-only. If you need the agent to commit, it should do so through
# the working-tree path.
if [[ -n "${PI_PARENT_GIT_MOUNT:-}" ]]; then
_pi_git_common_dir="$(git rev-parse --path-format=absolute --git-common-dir 2>/dev/null || true)"
_pi_git_work_tree="$(git rev-parse --show-toplevel 2>/dev/null || true)"
if [[ -n "${_pi_git_common_dir}" ]]; then
DOCKER_FLAGS+=(
"--volume" "${_pi_git_common_dir}:/git-data${_PI_WORKDIR_RO:+:ro}" # :ro set by pi:readonly
"--env" "GIT_DIR=/git-data"
)
# Mount the worktree root read-only only when it isn't already covered by
# the primary $(pwd):$(pwd) mount — i.e. launching from a subdirectory or
# a linked worktree whose root differs from the working directory.
if [[ "$(pwd -P)" != "${_pi_git_work_tree}" ]]; then
DOCKER_FLAGS+=(
"--volume" "${_pi_git_work_tree}:${_pi_git_work_tree}:ro"
"--env" "GIT_WORK_TREE=${_pi_git_work_tree}"
)
fi
fi
fi