fix: MainRepoRoot() and unify bare detection with git-dir/git-common-dir#4
Merged
Conversation
Move ShowPrefix(), RepoRoot(), MainRepoRoot(), RepoName() and their tests to repo_context.go / repo_context_test.go to consolidate repository state logic in one file. No behavior change. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
…e detection Unify bare/worktree detection using git-dir + git-common-dir from a single git rev-parse invocation, replacing the previous ListWorktrees + RepoRoot approach that required two git processes. Fix MainRepoRoot() which previously always applied filepath.Dir() to git-common-dir, causing it to return the parent directory for bare repos instead of the bare repo directory itself. Closes k1LoW#130 (Phase 1, Commit 2) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This comment has been minimized.
This comment has been minimized.
Enable `git wt` (list) to work in bare repositories by: - Removing the bare repository guard for the list operation - Adding CurrentLocation() that uses IsBareRoot() to dispatch between MainRepoRoot() (bare root) and CurrentWorktree() (normal/worktree) - Displaying "(bare)" in the BRANCH column for bare entries - Marking bare entry with "*" when running from bare root Fix bare detection for repos where git-common-dir ends with ".git" (e.g., core.bare=true layout) by combining --is-bare-repository flag with the filepath.Base heuristic using OR logic. Also unexport RepoContext fields and add four state query functions: IsNormalMain, IsNormalWorktree, IsBareRoot, IsBareWorktree. Closes k1LoW#130 (Phase 1 Commit 3) Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
This comment has been minimized.
This comment has been minimized.
Cover all 5 scenarios: normal repo, normal worktree, bare root, core.bare=true root, and bare worktree. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
Code Metrics Report
Details | | main (78c7a87) | #4 (f549edd) | +/- |
|---------------------|----------------|--------------|-------|
- | Coverage | 37.3% | 35.9% | -1.4% |
| Files | 13 | 13 | 0 |
| Lines | 987 | 1039 | +52 |
+ | Covered | 369 | 374 | +5 |
+ | Code to Test Ratio | 1:2.0 | 1:2.1 | +0.1 |
| Code | 2167 | 2260 | +93 |
+ | Test | 4520 | 4941 | +421 |
+ | Test Execution Time | 16s | 15s | -1s |Code coverage of files in pull request scope (28.7% → 27.4%)
Reported by octocov |
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
1 participant
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.
Summary
git rev-parse --git-dir --git-common-dirin a single process invocation, replacing the previousListWorktrees+RepoRoottwo-process approachMainRepoRoot()which incorrectly returned the parent directory for bare repos by always applyingfilepath.Dir()gitDirs()helper and 7 new test cases covering all 4 repo states (normal main, normal worktree, bare root, bare worktree)Test plan
TestGitDirs_NormalRepo— gitDir == gitCommonDir, Base == ".git"TestGitDirs_NormalWorktree— gitDir != gitCommonDir, Base == ".git"TestGitDirs_BareRepo— gitDir == gitCommonDir, Base != ".git"TestGitDirs_WorktreeFromBare— gitDir != gitCommonDir, Base != ".git"TestMainRepoRoot_BareRepo— returns bare repo directory itselfTestMainRepoRoot_WorktreeFromBare— returns bare repo directory from worktreeTestRepoName_BareRepo— returns correct name for bare repoTestDetectRepoContext_*tests pass unchangedgolangci-lint— 0 issuesgostyle— no project-level errorsCloses k1LoW#130 (Phase 1, Commit 2)
🤖 Generated with Claude Code