git reword --force-rewrite on a public commit moves the remote-tracking branch.

[ilyagr]

Description of the bug

1. Be on a public commit (main branch) that's synced with the remote tracking branch (origin/main)..
2. Do git reword --force-rewrite -m Something.

Expected behavior

The tip of the main branch moves to the reworded commit, but the origin/main branch stays where it was.

Actual behavior

Both main and origin/main move to the reworded commit, which is a weird and confusing state for a git repository to be in, especially if you are the only person using it (as though somebody else force-pushed to the remote while you weren't looking)

Version of rustc

No response

Automated bug report

Same as #515

Version of git-branchless

No response

Version of git

No response

[arxanas]

Hi @ilyagr, thanks for reporting. I agree that this is strange behavior; we should definitely only move local branches. I think this also causes issues if you try to do git push --force-with-lease later because your remote-tracking branch doesn't match the remote's branch.

[ilyagr]

It is annoying. I didn't mean to imply that it is a particularly urgent problem, though. There's even some poetic justice here. If you're going to rewrite a public commit, it's good to learn what kind of trouble this can cause other people, and how to recover from it.

…

On Thu, Sep 1, 2022 at 8:43 AM Waleed Khan ***@***.***> wrote: Hi @ilyagr <https://github.com/ilyagr>, thanks for reporting. I agree that this is strange behavior; we should definitely only move local branches. I think this also causes issues if you try to do git push --force-with-lease later because your remote-tracking branch doesn't match the remote's branch. — Reply to this email directly, view it on GitHub <#516 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AA7OTJ5OTXID6X3P3XKRWRTV4DFK5ANCNFSM572FC4GA> . You are receiving this because you were mentioned.Message ID: ***@***.***>