git (interactive) rebase fixup does not adhere to commit.cleanup = scissors setting?

user_574115 0
Viewed 82

So our commit logs always start with #workitemid: rest of title. This poses an issue when writing a commit message. Therefor we have the commit.cleanup setting set to scissors.

However, it seems like git rebase -i <hash> using fixup ignores this setting and errors out with "aborting due to empty commit message"

Is there a known workaround for this behaviour? We are currently on git version 2.17.1.windows.2 I am unaware whether this could be fixed in a newer version of git for windows.

git
2 Answers

The release notes of version 2.22.0 have this to say:

The list of conflicted paths shown in the editor while concluding a conflicted merge was shown above the scissors line when the clean-up mode is set to "scissors", even though it was commented out just like the list of updated paths and other information to help the user explain the merge better.

While this does not address your case directly, the change that fixed this item looks like it could also have solved your problem.

You should upgrade to version 2.22.0 at least.

user_68685430

Ran into this problem with git 2.25.1 and started to submit a bug report.

For verification I also tried git 2.35.1 (the newest release) and found this bug seems to have been fixed. I haven't checked the release notes of the in-between version to find out when exactly this change was added.

user_186584100
Related