Fix History destructive git on wrong lane from commit deeplinks - #348
Closed
cursor[bot] wants to merge 1 commit into
Closed
Fix History destructive git on wrong lane from commit deeplinks#348cursor[bot] wants to merge 1 commit into
cursor[bot] wants to merge 1 commit into
Conversation
History commit deeplinks without laneId used to fall back to the global selected lane or the first lane. getCommit resolves any object in the shared repo, so hard reset/cherry-pick/revert could mutate the wrong worktree. - Skip lane auto-fallback when URL has commitSha without a valid laneId - Track whether the commit came from lane history vs cross-repo lookup - Disable lane git mutations until the user selects the owning lane Co-authored-by: Arul Sharma <arul28@users.noreply.github.com>
The latest updates on your projects. Learn more about Vercel for GitHub. |
This was referenced May 23, 2026
arul28
commented
May 25, 2026
Owner
Consolidated into #356. |
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 freeto join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Bug and impact
Opening History with
commitShain the URL but no validlaneId(shared commit link, stale lane id, etc.) auto-selected the global lane or the first lane.getCommitresolves any commit in the shared object database, so hard reset / cherry-pick / revert / branch creation could run against the wrong worktree — branch pointer corruption and discarded uncommitted work.Root cause
HistoryPageURL hydration fell backfocusLaneIdwheneverlaneIdwas missing.hasWorktree, not whether the commit belongs to the focused lane's history.Fix
laneId.commitOnLaneHistory(listed in lane's recent commits vs cross-repogetCommitonly).Validation
npm --prefix apps/desktop run test -- --run src/renderer/components/history/historyGitActions.test.ts(12 passed)Related open PRs (not duplicated)