Commit message does not honor git configutation during rebase

[fedejeanne]

Version

7.6

Operating System

Windows

Bug description

When continuing a rebase operation that was started in the official Git (CLI) Client and that had conflicts, the configuration for the commit message cleanup mode is not honored and comments about the conflicting files remain in the commit message:

Important

I am using the strip mode as default for the commit cleanup mode.

To reproduce

1. Set strip to be the default commit message cleanup mode: git config set commit.cleanup strip
2. Start a rebase that produces a conflict from the git cli
3. Jump into Eclipse, fix the conflicts and finish the rebase

Actual behavior

Lines like these are present in the commit message after finishing the rebase with EGit

# Conflicts:
#	test/src/test/A.java

Expected behavior

The lines should not be present since my default configuration is strip

Relevant log output

Other information

The documentation also states that --cleanup=default should behave like whitespace (i.e. it should preserve the comments) if the message is not going to be edited:

default

Same as strip if the message is to be edited. Otherwise whitespace.

... but I am explicitly setting my default to be strip so the comments should not be present in the final commit message.

Here's the pertinent section in my git configuration file:

[commit]
	cleanup = strip

[msohn]

https://eclipse.gerrithub.io/c/eclipse-jgit/jgit/+/1231924 implementing this was merged