Conversation
PR SummaryLow Risk Overview This updates the error messaging accordingly and should restore correct behavior with Written by Cursor Bugbot for commit dbc5e43. Configure here. |
There was a problem hiding this comment.
Pull request overview
Adjusts the session-branch fetch+merge recovery logic to work correctly with go-git v6 by avoiding reliance on FETCH_HEAD (which isn’t a normal ref that go-git can resolve).
Changes:
- Resolve the remote commit via the remote-tracking ref (
refs/remotes/<remote>/<branch>) instead ofFETCH_HEAD. - Use the remote-tracking ref hash as the second parent when creating the merge commit.
Entire-Checkpoint: 217e7dcaa8ed
bd7f9ef to
76575e8
Compare
Turns out the old code worked with v5 but was not really correct
FETCH_HEADis not a direct ref, this should make it work with go-git v6 again