Gentoo Logo
Gentoo Spaceship




Note: Due to technical difficulties, the Archives are currently not up to date. GMANE provides an alternative service for most mailing lists.
c.f. bug 424647
List Archive: gentoo-dev
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Headers:
To: gentoo-dev@g.o
From: "Andreas K. Huettel" <dilfridge@g.o>
Subject: Re: Git braindump: 1 of N: merging & git signing
Date: Sun, 3 Jun 2012 12:39:21 +0200
Am Sonntag 03 Juni 2012, 10:18:24 schrieb Robin H. Johnson:
> I propose:
> - merges are explicitly allowed, even non-fast-forwards
> - all commits MUST be signed
> - if you include a commit from a user:
>   author := non-@gentoo
>   committer := @gentoo
>   signer := $committer
> 

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".

This is something that (IMHO) we could certainly live with; the only thing I 
am worried about is, how do we automatize it so a developer who is not end-of-
the-line git guru and ends up with some user-signed commits in his history can 
clean up his local tree again.


-- 

Andreas K. Huettel
Gentoo Linux developer 
dilfridge@g.o
http://www.akhuettel.de/

Attachment:
signature.asc (This is a digitally signed message part.)
Replies:
Re: Git braindump: 1 of N: merging & git signing
-- Dirkjan Ochtman
References:
Git braindump: 1 of N: merging & git signing
-- Robin H. Johnson
Navigation:
Lists: gentoo-dev: < Prev By Thread Next > < Prev By Date Next >
Previous by thread:
Re: Git braindump: 1 of N: merging & git signing
Next by thread:
Re: Git braindump: 1 of N: merging & git signing
Previous by date:
Re: Git braindump: 2 of N: developer interaction (merge co-ordinators)
Next by date:
Re: Git braindump: 2 of N: developer interaction (merge co-ordinators)


Updated Jun 29, 2012

Summary: Archive of the gentoo-dev mailing list.

Donate to support our development efforts.

Copyright 2001-2013 Gentoo Foundation, Inc. Questions, Comments? Contact us.