| Re: [jgit-dev] configure jgit to always include gerrit ChangeId |
|
Hey, Is it really necessary to have a Change-Id for a merge commit? I recall something very far away that it was possible to push merge commits without
the id to Gerrit even though the project has forced change-id on. Can somebody quickly retest this? Otherwise I’ll try to find time for it sometime next week (if I don’t forget ;)). Cheers, Markus Von: jgit-dev-bounces@xxxxxxxxxxx [mailto:jgit-dev-bounces@xxxxxxxxxxx]
Im Auftrag von Thiebaud, Christophe Done ! Filed enhancement bug ! https://bugs.eclipse.org/bugs/show_bug.cgi?id=439346 Christophe From: Matthias Sohn [mailto: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 Registered Office: Friesach bei Graz | Commercial Register: 49324 K | VAT no. ATU28654300 Commercial Court: Landesgericht für Zivilrechtssachen Graz |