Skip to main content

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]
Re: [jgit-dev] configure jgit to always include gerrit ChangeId


----- Ursprungligt meddelande -----
> Från: "Duft Markus" <Markus.Duft@xxxxxxxxxxxxxxxx>
> Till: "Christophe Thiebaud" <christophe.thiebaud@xxxxxxx>, "Matthias Sohn" <matthias.sohn@xxxxxxxxx>
> Kopia: "Thorsten Duda" <thorsten.duda@xxxxxxx>, "Brandon White" <brandon.white@xxxxxxx>, "Josh Chiang"
> <josh.chiang@xxxxxxx>, "Julian OPREA" <julian.oprea@xxxxxxx>, "JGit Developers list" <jgit-dev@xxxxxxxxxxx>
> Skickat: fredag, 18 jul 2014 16:49:03
> Ämne: 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 ;)).

I believe (!) this applies to non-merges as well, if you are allowed to push directly to a branch.

-- robin

> 
> 
> Cheers,
> 
> Markus
> 
> 
> 
> 
> Von: jgit-dev-bounces@xxxxxxxxxxx [mailto:jgit-dev-bounces@xxxxxxxxxxx] Im
> Auftrag von Thiebaud, Christophe
> Gesendet: Donnerstag, 10. Juli 2014 15:43
> An: Matthias Sohn
> Cc: White, Brandon; Chiang, Josh; JGit Developers list; OPREA, Julian; Duda,
> Thorsten
> Betreff: Re: [jgit-dev] configure jgit to always include gerrit ChangeId
> 
> 
> 
> 
> Done !
> 
> 
> 
> Filed enhancement bug !
> 
> 
> 
> https://bugs.eclipse.org/bugs/show_bug.cgi?id=439346
> 
> 
> 
> Christophe
> 
> 
> 
> 
> 
> From: Matthias Sohn [ mailto:matthias.sohn@xxxxxxxxx ]
> Sent: Montag, 7. Juli 2014 22:21
> To: Thiebaud, Christophe
> Cc: Halstrick, Christian; JGit Developers list
> Subject: Re: [jgit-dev] configure jgit to always include gerrit ChangeId
> 
> 
> 
> 
> 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
> Salomon Automation GmbH | Friesachstrasse 15 | 8114 Friesach bei Graz |
> Austria
> Registered Office: Friesach bei Graz | Commercial Register: 49324 K | VAT no.
> ATU28654300
> Commercial Court: Landesgericht für Zivilrechtssachen Graz
> 
> _______________________________________________
> jgit-dev mailing list
> jgit-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from
> this list, visit
> https://dev.eclipse.org/mailman/listinfo/jgit-dev


Back to the top