Skip to content

fix tag detection in linked worktrees #467

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
druckdev wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix tag detection in linked worktrees #467

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
23 changes: 21 additions & 2 deletions src/tag_db.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,25 @@ git_refdb* RefDb(git_repository* repo) {
return res;
}

std::string GetGlobalRepoPath(git_repository* repo) {
std::string dirname = git_repository_path(repo);
if (git_repository_is_worktree(repo)) {
// Unfortunately, to strip the worktrees/* suffix, we cannot
// simply do:
//
// dirname.resize(dirname.rfind(".git/worktrees/") + ".git/"s.size());
//
// since the repository could be a submodule. In that case the
// global git-dir path does not end in .git, but rather depends on
// the path that the repo (i.e. submodule) has in the
// superproject.
auto pos = dirname.find_last_of('/', dirname.size() - 2);
dirname.resize(pos - "worktrees"s.size());
}

return dirname;
}

} // namespace

TagDb::TagDb(git_repository* repo)
Expand Down Expand Up @@ -151,7 +170,7 @@ void TagDb::ReadLooseTags() {
loose_tags_.clear();
loose_arena_.Reuse();

std::string dirname = git_repository_path(repo_) + "refs/tags"s;
std::string dirname = GetGlobalRepoPath(repo_) + "refs/tags"s;
int dir_fd = open(dirname.c_str(), O_RDONLY | O_DIRECTORY | O_CLOEXEC);
if (dir_fd < 0) return;
ON_SCOPE_EXIT(&) { CHECK(!close(dir_fd)) << Errno(); };
Expand All @@ -175,7 +194,7 @@ void TagDb::UpdatePack() {
std::memset(&pack_stat_, 0, sizeof(pack_stat_));
};

std::string pack_path = git_repository_path(repo_) + "packed-refs"s;
std::string pack_path = GetGlobalRepoPath(repo_) + "packed-refs"s;
struct stat st;
if (stat(pack_path.c_str(), &st)) {
Reset();
Expand Down