fix(index): find the git dir from any directory in the repository - #82
Merged
Merged
Conversation
`RepositoryParser` discovers the repository the way git does, walking up
from wherever it was invoked. `IndexStorage` did not — it looked for
`./.git` and gave up. So every command worked from the repository root
and reported "not a git repository" one directory down, which is where
most people actually are:
$ cd src && git-semantic search "race condition"
error: not a git repository: .git directory not found
Discovery also resolves the `gitdir:` pointer in a linked worktree's or
submodule's `.git` file. Submodules write that pointer relative to the
submodule directory (`gitdir: ../.git/modules/<name>`); reading the file
by hand resolved it against the process's working directory instead and
put the index outside the repository.
`InvalidGitFile` now marks a `.git` entry that exists but does not
resolve, so a broken worktree keeps its own hint instead of being told it
is not in a repository.
The storage tests built a bare `.git` directory that no git tool would
accept. They now initialize real repositories, which is what the file
headers claimed all along.
Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
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.
git-semanticonly worked from the repository root. One directory down it claimed you were not in a git repository:RepositoryParseralready discovers the repository the way git does, walking up from wherever it was invoked.IndexStoragedid not — it looked for./.gitand gave up. The two halves of the tool disagreed about which directory counts as "the repository".Both now discover. Three things follow:
index,search,update, andstatsresolve to the same index no matter where in the tree they run..gitfile points at the parent with a relative path (gitdir: ../.git/modules/<name>). Reading that file by hand resolved it against the process's working directory, putting the index outside the repository.InvalidGitFilenow marks a.gitentry that exists but does not resolve, instead of being reported as "not a git repository".Tests
Four new cases in
src/index/storage.rs: root and subdirectory agree, a subdirectory reads back what the root wrote, a relativegitdir:pointer resolves against the repository, and a dangling pointer is not misreported.The storage and ANN/hybrid suites built a bare
.gitdirectory that no git tool would accept. They now initialize real repositories, which is what their file headers claimed all along.Verified by hand:
statsfromsrc/behaves identically tostatsfrom the root, and a genuine non-repository still errors.First of four stacked PRs. Merge order: this → #shell-completions → #zero-config-first-run → #quiet-logs.