Skip to content

test: cover empty-mapping rebase regression#1909

Open
svarlamov wants to merge 1 commit into
mainfrom
fix/1476-1784396869
Open

test: cover empty-mapping rebase regression#1909
svarlamov wants to merge 1 commit into
mainfrom
fix/1476-1784396869

Conversation

@svarlamov

@svarlamov svarlamov commented Jul 18, 2026

Copy link
Copy Markdown
Member

Fixes #1476

Summary

  • Add a TestRepo regression for an empty-mapping rebase followed by a real rebase to the same origin/main target.
  • Prove the first rebase actually drops the already-upstream equivalent commit before exercising the later rebase.
  • Verify the amended AI commit keeps its authorship note, exact line attribution, and 2 AI / 0 unknown stats after the second rebase.

The live reflog-segment resolver implicated by #1476 was removed when #1542 replaced it with trace2/ref-cursor processing. The old proposed RebaseSkipped fix in #1478 now targets dead code, so this PR locks in the current behavior without reviving that architecture.

Test coverage

  • Historical red check: the regression fails at the final note assertion on the issue-era parent commit ef8bc3157.
  • task test TEST_FILTER=test_empty_mapping_rebase_does_not_block_later_rebase_to_same_target
  • task lint
  • task fmt
  • task test was run twice; the new regression passed both times. Each run ended on a different unrelated daemon-sync flake, and both flaky tests passed immediately in isolation:
    • test_author_config_partial_overrides_fall_back_to_git_committer_identity
    • test_nested_subrepo_mixed_edits_mock_ai

Open in Devin Review

Copy link
Copy Markdown
Member Author

This stack of pull requests is managed by Graphite. Learn more about stacking.

@devin-ai-integration devin-ai-integration Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

✅ Devin Review: No Issues Found

Devin Review analyzed this PR and found no bugs or issues to report.

Open in Devin Review

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.

No-op rebase segment can block later authorship note rewrite, causing stats to report 100% unknown

1 participant