Skip to content

Recover attribution after nuanced Trace2 gaps #2074

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
svarlamov wants to merge 5 commits into
base: codex/missing-trace2-recovery-core
Choose a base branch
from
Open

Recover attribution after nuanced Trace2 gaps #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
bd2ebf1
recover attribution after missed rebase traces
svarlamov Aug 3, 2026
c8c1ce2
recover nuanced operations after trace2 gaps
svarlamov Aug 3, 2026
b19dacc
scope stash recovery to target operations
svarlamov Aug 3, 2026
e6149de
address trace2 recovery review findings
svarlamov Aug 3, 2026
6d14e66
preserve destructive stash target attribution
svarlamov Aug 3, 2026
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: 5 additions & 3 deletions src/daemon.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6352,9 +6352,11 @@ impl ActorDaemonCoordinator {
}
}

// Handle update-ref: migrate working logs and authorship notes when the ref
// update affects the currently checked-out branch.
if primary == "update-ref"
// Handle direct tip movers: migrate working logs and authorship notes when
// the update affects the currently checked-out branch. A branch create/reset
// (`branch -f`) uses the same rewrite, while rename/copy lifecycle events do not.
if (primary == "update-ref"
|| primary == "branch" && crate::daemon::ref_cursor::branch_command_is_tip_update(cmd))
&& let Some(worktree) = cmd.worktree.as_ref()
{
for event in events {
Expand Down
Loading
Loading