Re: [jgit-dev] configure jgit to always include gerrit ChangeId

[Matthias Sohn <matthias.sohn@xxxxxxxxx>]

On Mon, Jul 7, 2014 at 6:56 PM, Thiebaud, Christophe <christophe.thiebaud@xxxxxxx> wrote:

I have another question.

 

The jgitflow plugin uses also the merge API from jgit.

 

After having patched jgitflow so that each and every call to git.commit() contains a setInsertChangeID(true), I note that these merge commit still do not include changeIDs. (see attachments - names should be self-explanatory)

 

In fact, looking at the MergeCommand, there seems to be no way to force the inclusion of a changeID in the merge commit generated.

 

So I cannot even fall back on patching each and every jgitflow commit with a setInsertChangeID(true).

 

Or maybe a merge commit does not need a changeID ? otherwise, how does EGit controls that ?

that's missing completely, also in EGit. As a workaround you can amend the merge commit after a merge is done.

I think we should also enhance MergeCommand to support setting changeId similarly to CommitCommand.

As I am not so sure if I miss something I'd suggest you first file an enhancement bug for doing that and we'll

check with Christian if my idea fits into merge as well (it's more complicated than commit).

CC-ing the mailing list so that others can see this discussion.

--

Matthias