Sameen Karim 9421bd66a3 Fix for replaying amended parent commits during rebase (#333) ...

* Avoid replaying amended parent commits

Preserve a branch's last valid base when its parent is rewritten, and only
use verified ancestor commits as rebase boundaries. Recover previously
corrupted metadata from the parent reflog when possible, otherwise stop
safely instead of replaying superseded parent commits.

* Record adopted branch merge bases

Store the actual common ancestor when adding an existing branch so cascade rebases replay only that branch's unique commits while retaining the amended-parent safety guard.

Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>

Copilot-Session: 30bcbf2a-5ef1-4bdb-a0fc-618294ae8ded

---------

Copilot-Session: 30bcbf2a-5ef1-4bdb-a0fc-618294ae8ded

2026-07-29 13:32:06 -04:00

..

git.go

Fix for replaying amended parent commits during rebase (#333)

2026-07-29 13:32:06 -04:00

gitops_test.go

Fix to properly revert after aborting modify (#167)

2026-07-15 12:07:42 -04:00

gitops.go

Fix for replaying amended parent commits during rebase (#333)

2026-07-29 13:32:06 -04:00

mock_ops.go

Fix for replaying amended parent commits during rebase (#333)

2026-07-29 13:32:06 -04:00

rebase_start_test.go

Rebase stacks onto the latest remote trunk (#330)

2026-07-29 13:32:06 -04:00