Keep bare-repository worktrees non-bare - #2224
Merged
Merged
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Fixes incorrect bare-repo detection when instantiating Repo from a linked worktree created off a bare common repository, ensuring working_tree_dir remains available for index operations and matching native git rev-parse behavior.
Changes:
- Treat linked worktrees as non-bare even if the common repository has
core.bare=true. - Preserve the discovered
working_tree_dirfor linked worktrees so operations likeindex.add()work. - Add a regression test asserting parity with
git rev-parse --is-bare-repositoryand validatingworking_tree_dir.
Reviewed changes
Copilot reviewed 2 out of 2 changed files in this pull request and generated 1 comment.
| File | Description |
|---|---|
git/repo/base.py |
Adjusts bare-repo detection to keep linked worktrees non-bare when commondir indicates a linked worktree. |
test/test_repo.py |
Adds a regression test covering Repo discovery from a worktree created from a bare repository. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
<!-- agent --> Opening a linked worktree created from a bare repository read `core.bare` from the common repository and discarded the worktree path. Keep a discovered linked worktree non-bare when its administrative directory has a `commondir` marker. The regression compares Git rev-parse behavior and verifies Repo.bare and working_tree_dir. Git baseline: 0bd5a6920d7c4238e0d90ddc0e7e08866e84a0f1; environment.c:is_bare_repository() and setup.c:check_repository_format_gently(). Git 2.50.1 reports the linked checkout as non-bare. Assisted-by: GPT 5.6 Co-authored-by: GPT 5.6 <codex@openai.com>
Byron
force-pushed
the
worktree-from-bare
branch
from
September 1, 2026 07:59
4a6b2f3 to
180b1ff
Compare
Byron
force-pushed
the
worktree-from-bare
branch
from
September 1, 2026 09:27
137342f to
1a4c245
Compare
<!-- agent --> Cygwin patches ensurepip to load setuptools and pip wheels from `/usr/share/python-wheels`. The rolling python-pip-wheel package advanced to pip 26.2.1, which requires Python 3.10 or newer, so every Python 3.9 venv creation failed—including the installation test's nested virtual environment. Keep the single Cygwin lane on Python 3.9 because the regular matrix already covers Python 3.12 and newer. Install Cygwin's setuptools wheel, download pip 26.0.1 from its immutable PyPI URL into ensurepip's shared wheel directory, verify its SHA-256 digest, and avoid upgrading pip. This fixes all venv creation without relying on a version that may disappear from rolling Cygwin mirrors. Assisted-by: GPT 5.6 Co-authored-by: GPT 5.6 <codex@openai.com>
Byron
force-pushed
the
worktree-from-bare
branch
from
September 1, 2026 09:42
1a4c245 to
0e8c23c
Compare
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Tasks
This section is for Byron only. Models continuing this PR must not add, remove, check, uncheck, rename, or reorder checkboxes here.
Everything below this line was generated by Codex GPT-5.
Created by Codex on behalf of Byron. Byron will review before this is ready to merge.
Fixes #2223
Summary
Git reference
Git 2.50.1 reports the linked checkout as non-bare. The implementation was checked against Git source baseline 0bd5a6920d7c4238e0d90ddc0e7e08866e84a0f1, notably environment.c is_bare_repository() and setup.c check_repository_format_gently().
Commits
bare = True#2223)Validation