Skip to content

fix(worktree): treat non-git project paths as having no archive ref #2

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

fix(worktree): treat non-git project paths as having no archive ref #2

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
8 changes: 8 additions & 0 deletions source/cydo/worktree.d
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,14 @@ private enum ArchiveRefState

private ArchiveRefState getArchiveRefState(string projectPath, int tid)
{
// a non-git projectPath (e.g. an "unrestricted" workspace rooted at a plain
// directory like $HOME) can't hold an archive ref at all; rev-parse would
// bail with "not a git repository" (exit 128), so resolve to Missing before
// the strict status check below treats non-0/1 exits as genuine git failures
auto insideWorkTree = execute(["git", "-C", projectPath, "rev-parse", "--is-inside-work-tree"]);
if (insideWorkTree.status != 0)
return ArchiveRefState.Missing;

auto refName = format!"refs/cydo/worktree-archive/%d"(tid);
auto cmd = ["git", "-C", projectPath, "rev-parse", "--verify", "--quiet", refName];
auto result = execute(cmd);
Expand Down