Show current git branch of a mounted git drive + pick up pull fix (1.53.0)#106
Merged
Conversation
The node now reports the working tree's checked-out branch on clone/sync; it's persisted on MountRecord.currentBranch and surfaced in the CLI (`drive ls` `src@branch`, `drive status` Branch line) and the dashboard TUI (Branch row in the mount detail, `@branch` in the list). Depends on omnydrive ^1.10.1, which also fixes the git-drive pull crash when the checked-out branch isn't on the origin. Co-Authored-By: Claude Opus 4.8 (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
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
Two related git-drive improvements:
Show the current checked-out branch of a mounted git drive. The node reports the working tree's branch on clone/sync; it's persisted on
MountRecord.currentBranchand shown in:omnyshell drive ls(src@branch) anddrive status(aBranch:line).Branchrow in the mount detail and@branchin the mount list.Picks up omnydrive 1.10.1, which fixes the git-drive pull crash (
git merge --ff-only origin/<branch> - not something we can merge) when the node is on a branch that isn't on the origin — pull now no-ops when there's nothing to pull, else fetches the branch by name and fast-forwardsFETCH_HEAD.Notes
branchfield to thegit.clone/git.sync/git.headreplies (viaGitCli.currentBranch); the client captures it inmountGit/remount/_syncGit.currentBranchfalls back to the requestedgitBranchfor display until first observed.Test plan
dart analyze+dart format --set-exit-if-changed .— clean.record.currentBranchequals the origin's checked-out branch.omnydrive: ^1.10.1.🤖 Generated with Claude Code