Always use commit message of editing commit

[RanceZero]

Sometimes in my workflow I am thinking of doing a commit and so start writing its commit message, then, decide to edit a previous commit, but when I am about to recommit this previous commit I see the commit message is not of the commit I am editing but from the one I was doing before. I do not know if this is the only occasion where a previous commit message gets stick when it should not, but is an example of some that does.
Maybe my workflow is the wrong one here, but I have countless times found myself commiting edits with a commit message that was not from that commit, and this is troublesome.

[CheyenneWills]

I just got bit by this as well.

[RanceZero]

It always happen when I abort editing a commit and edit other, it is always with the commit message from the one I aborted and not from the one I am editing now.

[CheyenneWills]

This is a bug. I've been bitten again with this problem.

Editing a commit contents should not result in the commit message being replaced with the message from a different commit.

[CheyenneWills]

I can easily reproduce this.

1. edit commit A's contents
2. abort rebase
3. edit commit B's contents
4. BUG... the commit message is now set to commit A's commit message.

sublime merge Dev Channel, Build 1104

Fails also on Dev Channel, Build 1111

[CheyenneWills]

Some more info.

It looks like the aborted commit message becomes "sticky", until a commit actually is saved. You can "modify" the commit message and as long as you don't save a commit it follows around for any commit edits until a commit is saved. It also persists across closing the app and starting again

[BenjaminSchaaf]

I can't reproduce this in dev build 1202

[RanceZero]

I am not able to reproduce this bug as of build 2039.

[FichteFoll]

I experienced this exact issue 2 weeks ago on either 2046 or 2048 (can't say for sure since it was the day of 2048's release). Someone else on Discord also noted they ran into it on 2049.

[RanceZero]

@FichteFoll Should I reopen this issue? Please show a video of issue reproduction or explain me the exact steps you did so that I reproduce it here.

[FichteFoll]

2021-03-25_00-52-59.mp4

This is on 2048, btw.

[RanceZero]

@FichteFoll you are correct. Doing the same workflow I reproduced the Issue on build 2049.

[CheyenneWills]

Slightly different sequence. Note, the video capture did not pick up the pop-ups. The sequence is:

Selected commit "A"
edit commit -> edit commit contents -- followed by clicking "ok" in the pop-up
click on abort rebase (twice)

Selected commit "B"
edit commit -> edit commit contents -- followed by clicking "ok" in the pop-up
click on commit and continue rebase.

End result, Commit "B"'s commit message is replaced with message commit "A" (the aborted rebase).

2021-03-24.19-01-07.mp4

[dpjohnst]

Hi all,

This should be resolved as of Sublime Merge Build 2054 (stable).
When you have a spare moment, please confirm that it's been resolved on your end and I can go ahead and close this issue.

Thanks,
- Dylan

[CheyenneWills]

Hi all,

This should be resolved as of Sublime Merge Build 2054 (stable).
When you have a spare moment, please confirm that it's been resolved on your end and I can go ahead and close this issue.

Thanks,

• Dylan

I was unable to reproduce the problem by following the steps I listed above (using sublime merge build 2052).

So I believe that the issue has been corrected.

Thanks
/Cheyenne

[RanceZero]

Tested both @CheyenneWills and @FichteFoll test steps here on build 2054. Issue was not reproduced. Seems fixed @dpjohnst .