From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1SbDGJ-0000Uu-9W for garchives@archives.gentoo.org; Sun, 03 Jun 2012 16:02:39 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5A606E07A4; Sun, 3 Jun 2012 16:02:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id E46D4E0783 for ; Sun, 3 Jun 2012 16:01:26 +0000 (UTC) Received: from mail-ob0-f181.google.com (mail-ob0-f181.google.com [209.85.214.181]) (using TLSv1 with cipher RC4-MD5 (128/128 bits)) (No client certificate requested) (Authenticated sender: djc) by smtp.gentoo.org (Postfix) with ESMTPSA id 546F21B400C for ; Sun, 3 Jun 2012 16:01:26 +0000 (UTC) Received: by obbuo19 with SMTP id uo19so6642778obb.40 for ; Sun, 03 Jun 2012 09:01:24 -0700 (PDT) Received: by 10.60.25.164 with SMTP id d4mr9198705oeg.26.1338739284728; Sun, 03 Jun 2012 09:01:24 -0700 (PDT) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-dev@lists.gentoo.org Reply-to: gentoo-dev@lists.gentoo.org MIME-Version: 1.0 Received: by 10.182.33.37 with HTTP; Sun, 3 Jun 2012 09:01:04 -0700 (PDT) In-Reply-To: <201206031239.21744.dilfridge@gentoo.org> References: <201206031239.21744.dilfridge@gentoo.org> From: Dirkjan Ochtman Date: Sun, 3 Jun 2012 18:01:04 +0200 Message-ID: Subject: Re: [gentoo-dev] Git braindump: 1 of N: merging & git signing To: gentoo-dev@lists.gentoo.org Content-Type: text/plain; charset=UTF-8 X-Archives-Salt: efe1381a-6222-4b60-89e0-bfdfaa619d18 X-Archives-Hash: 13d55231edb10c228bdad4f854044ee3 On Sun, Jun 3, 2012 at 12:39 PM, Andreas K. Huettel 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