Gentoo Archives: gentoo-dev

From: Markos Chandras <hwoarang@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 10:21:04
In Reply to: [gentoo-dev] Git braindump: 1 of N: merging & git signing by "Robin H. Johnson"
Hash: SHA512

On 06/03/2012 09:18 AM, Robin H. Johnson wrote:
> This is one of several braindumps I've got, getting what are > potentially very important details about the Git stuff out of my > head, so that it doesn't matter if I become hit by a bus. Apologies > if this mail seems a bit scrambled, per -core, my brain is rather > scrambled lately. > > TL;DR: ------ 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 >
What you said makes perfectly sense to me. We are a big project with a high commit rate so forcing everyone to rebase (especially non-dev people) their patches would be too much pain. I don't believe linear history is critical in our case. - -- Regards, Markos Chandras / Gentoo Linux Developer / Key ID: B4AFF2C2 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQIcBAEBCgAGBQJPyzpKAAoJEPqDWhW0r/LCX9kP/iesS2Gcxw189eifXuH/OH1o f5YzpUi1lKpg8mqVZ/oVDv+LKIfeC7FiWoZTZRIa/yUOcFkjl5DIlzFxF3PASmfF 3DlJsk3btCP6I8BeZx9pMRVmtjO7n0H9w3Locf0f8THQfvl8ZwEOS7gtGTkrBWIs uXYPO2Je59QW4uP0TAWWQQCXBd2Job9j+0T43z60+uIPOopl28UwffdInvSmh7+K WZIPomtsd/JNZzBQcO+KRqCgDeLTlGFe4SnNJX571fWwmGUr/334QcOtRn+VgemH 9rwJtdAiXI16y3uoIa4ztMuN1/vG+NCZbuHwzYzNV5t8T14n1hVHMqnbPj8tPDk6 WiboF+YCP9mSOYBsJqh9XPPso1BhhXeGZ7V30tQxjCAAlEso2lUcYgRSWexifSvi 3u9ofaavtt0wbANaVghNAKK5b6AXGKey1alsKJB5Uvhqq1JIKbFt1DinrYUgBgMS v/tSq4pL4iEYA3p3dYUwt1Db+/o1dCSwc2itZFgluTQXa3t6c5E2vsgMP/t/QnJY 6IMzPdXoraG5XeZT0FavzBjDSIgvPxFNs/bYdvTaQwxzZTxT0N30ZjEJreVpz81g rfzmSDyuzo8rgzGK5AVKx8aNlaebja2QhO7uCuVvjoPpmnF2PAnfQ8fsybl3T8bq 3+g6gNF2loBFLA9Jczgy =/o+N -----END PGP SIGNATURE-----