Gentoo Archives: gentoo-dev

From: Dirkjan Ochtman <djc@g.o>
To: gentoo-dev@l.g.o
Subject: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing
Date: Sun, 03 Jun 2012 16:02:39
Message-Id: CAKmKYaCin65oaPiynVBMSL0psfZVsti4oFpd=DYw3mp_pf2-RA@mail.gmail.com
In Reply to: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing by "Andreas K. Huettel"
On Sun, Jun 3, 2012 at 12:39 PM, Andreas K. Huettel
<dilfridge@g.o> wrote:
> Sounds reasonable given the current state of git. Let's just be clear about > the following consequence (I hope I understand this correctly): > > * User makes signed improvements in gentoo-x86 clone > * Developer pulls from user and >merges< > * Developer's history contains commits by user, which cannot be pushed to > gentoo-x86 > > Which means in the end "all merges are explicitly allowed, as long as they > only contain developer commits; commits pulled from users must be rebased".
I don't think so. IMO pushing commits by a user should be a fine, as long as they're merged in a non-fast-forward, signed merge commit. Cheers, Dirkjan

Replies

Subject Author
Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing "Andreas K. Huettel" <dilfridge@g.o>