Skip to content

fix: workspace_diff not resolving correctly when comparing against target branch that is moving or post-rebase#19

Merged
Ziinc merged 7 commits into
mainfrom
ty/treq-264-bug-reversal-of-other-commits-are-getting-rendered-in-the
Jul 9, 2026
Merged

fix: workspace_diff not resolving correctly when comparing against target branch that is moving or post-rebase#19
Ziinc merged 7 commits into
mainfrom
ty/treq-264-bug-reversal-of-other-commits-are-getting-rendered-in-the

Conversation

@Ziinc

@Ziinc Ziinc commented Jul 6, 2026

Copy link
Copy Markdown
Owner

fixes bug where the workspace_diff post-autorebase does not resolve correctly:

Desired behaviour

  main ── U1 ── U2
             \
              W1   (workspace-authored commit)

  After force rebase, we still want the committed diff to reflect the workspace’s own commit lineage:

  main ── U1 ── U2
                 \
                  W1'  (rewritten workspace-authored commit)

buggy behaviour is such that the target branch (main) whcih now has U1 and U2, and the tip of the branch is resolved as @-, which resolves to W1 instead of W1' and hence the this results in Reviews tab showing "reversals" of commits (as we are now comparing in the reverse)

@Ziinc Ziinc merged commit b38bbda into main Jul 9, 2026
6 of 8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant