[gentoo-dev] Signed-off-by verification incoming

[gentoo-dev] Signed-off-by verification incoming

[Michał Górny]

[-- Attachment #1: Type: text/plain, Size: 1123 bytes --]

Hi, everyone.

Just FYI, I'm going to enable the git hook to verify Signed-off-by tags
on gentoo.git (most likely all repos later on).  I've tested it against
all the test cases I could think of but if you have any trouble pushing,
please ping me or others in #-infra.

Please note that for the hook to work:

1. Every commit must contain 'Signed-off-by' of the committer.

2. You must use your @gentoo.org address in committer (this was already
enforced)  and in Signed-off-by.

3. You must use your real name *as stated in LDAP* in Signed-off-by
(committer can be anything).  Both regular (cn) and ASCII (gecos)
version is accepted, and the match should be case-insensitive (at least
as far as case-insensitive works in bash).

If you need to change your real name to match your preferred spelling
(e.g. 'Matt' to 'Matthew'), please ping us as well.

As a side note, I'd like to repeat that while this is not enforced,
if you merge a copyrightable (i.e. non-trivial) external contribution,
please get Signed-off-by from its author and append yours below it.

-- 
Best regards,
Michał Górny

[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 963 bytes --]

Re: [gentoo-dev] Signed-off-by verification incoming

[Jeroen Roovers]

On Sat, 29 Sep 2018 10:19:10 +0200
Michał Górny <mgorny@gentoo.org> wrote:

> Hi, everyone.
> 
> Just FYI, I'm going to enable the git hook to verify Signed-off-by
> tags on gentoo.git (most likely all repos later on).  I've tested it
> against all the test cases I could think of but if you have any
> trouble pushing, please ping me or others in #-infra.
> 
> Please note that for the hook to work:
> 
> 1. Every commit must contain 'Signed-off-by' of the committer.
> 
> 2. You must use your @gentoo.org address in committer (this was
> already enforced)  and in Signed-off-by.
> 
> 3. You must use your real name *as stated in LDAP* in Signed-off-by
> (committer can be anything).  Both regular (cn) and ASCII (gecos)
> version is accepted, and the match should be case-insensitive (at
> least as far as case-insensitive works in bash).
> 
> If you need to change your real name to match your preferred spelling
> (e.g. 'Matt' to 'Matthew'), please ping us as well.
> 
> As a side note, I'd like to repeat that while this is not enforced,
> if you merge a copyrightable (i.e. non-trivial) external contribution,
> please get Signed-off-by from its author and append yours below it.
> 

remote: 8833535ff8f041d308284149193f5c7322b37b26: no GCO sign-off
present
remote: e034098e139484cddd1614b55b844898190b21d6: no GCO sign-off
present
remote: a1c64ac2ac71ef2291d472318d5ffc2218800cd4: no GCO sign-off
present
remote: 1e846c6372d629171b16282db5ce644577a991fc: no GCO sign-off
present
remote: e567d8374ec8cbb6f79ac1a3ceef3c71de529d6e: no GCO sign-off
present
remote: 6131f30065fbff4a50259b81b4e9e88b2ad03661: no GCO sign-off
present

Please:

0a) Explain to me how to fix my commits that I now can't push, or
0b) disable that hook immediately.
1) Update repoman to enforce it _before_ the commit is executed.
2) Wait for the repoman update to trickle down to all developers.
3) Announce it ahead of time.
4) Re-enable the hook.

Re: [gentoo-dev] Signed-off-by verification incoming

[Dirkjan Ochtman]

[-- Attachment #1: Type: text/plain, Size: 918 bytes --]

On Sat, Sep 29, 2018 at 3:14 PM Jeroen Roovers <jer@gentoo.org> wrote:

> 0a) Explain to me how to fix my commits that I now can't push, or
> 0b) disable that hook immediately.
>

Try git rebase -i and use "r" for "reword" on every commit.


> 1) Update repoman to enforce it _before_ the commit is executed.
>

Some kind of repoman support would make this much easier to handle. As it
is, doing this by hand for the trivial case (only my own changes) is a
PITA. repoman could grow some kind of --sign-off option that appends this
to the commit message presumably?

I think repoman checks happen on the tree, not on the commit, so I'm not
sure how you think enforcing it before the commit makes sense (the line is
effectively part of the commit).


> 2) Wait for the repoman update to trickle down to all developers.
> 3) Announce it ahead of time.
>

Some more lead time would be appreciated, yes.

Regards,

Dirkjan

[-- Attachment #2: Type: text/html, Size: 1587 bytes --]

Re: [gentoo-dev] Signed-off-by verification incoming

[Rich Freeman]

On Sat, Sep 29, 2018 at 9:25 AM Dirkjan Ochtman <djc@gentoo.org> wrote:
>
> Some kind of repoman support would make this much easier to handle. As
> it is, doing this by hand for the trivial case (only my own changes)
> is a PITA. repoman could grow some kind of --sign-off option that
> appends this to the commit message presumably?
>

Does "repoman commit" no longer do the right thing?

-- 
Rich

Re: [gentoo-dev] Signed-off-by verification incoming

[Jeroen Roovers]

On Sat, 29 Sep 2018 15:25:25 +0200
Dirkjan Ochtman <djc@gentoo.org> wrote:

> On Sat, Sep 29, 2018 at 3:14 PM Jeroen Roovers <jer@gentoo.org> wrote:
> 
> > 0a) Explain to me how to fix my commits that I now can't push, or
> Try git rebase -i and use "r" for "reword" on every commit.

`git rebase ---signoff` did the trick.


Kind regards,
     jer

Re: [gentoo-dev] Signed-off-by verification incoming

[kuzetsa]

On 09/29/2018 09:29 AM, Rich Freeman wrote:
> On Sat, Sep 29, 2018 at 9:25 AM Dirkjan Ochtman <djc@gentoo.org> wrote:
>>
>> Some kind of repoman support would make this much easier to handle. As
>> it is, doing this by hand for the trivial case (only my own changes)
>> is a PITA. repoman could grow some kind of --sign-off option that
>> appends this to the commit message presumably?
>>
> 
> Does "repoman commit" no longer do the right thing?
> 

amd64 keyword-stable app-portage/repoman doesn't seem to, so
I had to use repoman manifest && git commit -s -S recently

Re: [gentoo-dev] Signed-off-by verification incoming

[Thomas Deutschmann]

[-- Attachment #1.1: Type: text/plain, Size: 915 bytes --]

On 2018-09-29 15:14, Jeroen Roovers wrote:
> Please:
> 
> 0a) Explain to me how to fix my commits that I now can't push, or

Like you have already figured out, "git commit --signoff" when doing
profile/eclass changes and to fix things, "git commit --amend --signoff".


> 1) Update repoman to enforce it _before_ the commit is executed.

Please add

> DCO_SIGNED_OFF_BY="Larry the Cow <larry@gentoo.org>"

to your make.conf and "repoman commit" will do it for your.


> 2) Wait for the repoman update to trickle down to all developers.

DCO_SIGNED_OFF_BY is present since 2013-04-22 20:01:29 -0700. So it
should be available for all developers.


> 3) Announce it ahead of time.

I agree. Communication was bad. We should have included dev howto with
that announcement.


-- 
Regards,
Thomas Deutschmann / Gentoo Linux Developer
C4DD 695F A713 8F24 2AA1 5638 5849 7EE5 1D5D 74A5


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 618 bytes --]

Re: [gentoo-dev] Signed-off-by verification incoming

[Dirkjan Ochtman]

[-- Attachment #1: Type: text/plain, Size: 228 bytes --]

On Sat, Sep 29, 2018 at 4:52 PM Thomas Deutschmann <whissi@gentoo.org>
wrote:

> I agree. Communication was bad. We should have included dev howto with
> that announcement.
>

Thanks for the helpful pointers!

Regards,

Dirkjan

[-- Attachment #2: Type: text/html, Size: 522 bytes --]

Re: [gentoo-dev] Signed-off-by verification incoming

[kuzetsa]

On 09/29/2018 10:52 AM, Thomas Deutschmann wrote:
> On 2018-09-29 15:14, Jeroen Roovers wrote:
>> Please:
>>
>> 0a) Explain to me how to fix my commits that I now can't push, or
> 
> Like you have already figured out, "git commit --signoff" when doing
> profile/eclass changes and to fix things, "git commit --amend --signoff".
> 
> 
>> 1) Update repoman to enforce it _before_ the commit is executed.
> 
> Please add
> 
>> DCO_SIGNED_OFF_BY="Larry the Cow <larry@gentoo.org>"
> 
> to your make.conf and "repoman commit" will do it for your.
> 
> 
>> 2) Wait for the repoman update to trickle down to all developers.
> 
> DCO_SIGNED_OFF_BY is present since 2013-04-22 20:01:29 -0700. So it
> should be available for all developers.
> 
> 
>> 3) Announce it ahead of time.
> 
> I agree. Communication was bad. We should have included dev howto with
> that announcement.
> 
> 

this thread was mentioned today in #gentoo-dev-help

[20:35:26] <kuzetsa> I never would've thought to look for
repoman docs there O__o

[20:36:16] <kuzetsa> ironically, the documentation for
this repoman feature is in the manpage for make.conf
instead of the manpage for repoman - weird, but I guess
it is technically documented already

sneaky :)

maybe could be in the repoman manpage instead? (too?)