I see a bunch of projects doing things like master - Main Gentoo branch of X origin/XXX - Upstream branch of X This poses a bit of a problem when folks go to update the origin/XXX branch, because those commits will not be signed or have the DCO; they are literally the upstream commits. In a similar fashion, when we merge those commits into the master branch, they are literally the upstream commits, so they will also lack a gpg signature or DCO. We could forge a merge commit here, but that seems suboptimal. One proposal I suggested was to adopt a naming scheme where we basically don't check commits on branches named origin/XXX or if the merge is from origin/XXX to some other branch not under origin/...; essentially exempting these from requiring the DCO. -A
I agree that the commits should be excluded from the GCO requirement. 1. The the mirrored commits are unmodified and can be matched 1:1 to original upstream commits. 2. Upstream GPG signatures on the commits are preserved. 3. Some of the commits might already have a Signed-Off-By header from upstream that signifies acceptance with THAT project's DCO equivalent, that might have different terms than the GCO or Kernel DCO. I'm not 100% set on the 'origin' name, and want to also know how to track upstreams with multiple repos and branches. 'upstream/$SOMETHING/$BRANCH' ?
*** Bug 698454 has been marked as a duplicate of this bug. ***
Why not just move them to a separate category and disable the hook for all repos there?
(In reply to Michał Górny from comment #3) > Why not just move them to a separate category and disable the hook for all > repos there? I guess I see it as cleaner organizationally if a project's work can be included in the project's repository as opposed to being split across two different ones. Therefore I like Robin's proposal better. At least I'd like that flexibility.
mgorny: please review the changes on this branch https://gitweb.gentoo.org/infra/githooks.git/log/?h=branch-selection Specifically, it makes which git refs enforce GCO configurable. The default continues to be ALL refs. mgorny has asked that I also get council approval of this change, since he considers it a policy change as well