From: Christian Couder <christian.couder@gmail.com>
To: Dan Kohn <dan@linuxfoundation.org>
Cc: git <git@vger.kernel.org>
Subject: Re: Request for git merge --signoff
Date: Tue, 25 Jul 2017 07:42:45 +0200 [thread overview]
Message-ID: <CAP8UFD0KoamG88x-vWXPWT-pv8=f-v+fxOKH1=B9NrZrZhTm=g@mail.gmail.com> (raw)
In-Reply-To: <CAHv71zK5SqbwrBFX=a8-DY9H3KT4FEyMgv__p2gZzNr0WUAPUw@mail.gmail.com>
On Sat, Jul 1, 2017 at 5:24 PM, Dan Kohn <dan@linuxfoundation.org> wrote:
> https://github.com/coreinfrastructure/best-practices-badge is a user
> of the https://github.com/probot/dco bot which checks that commits
> have a signoff. The issue is that there is no `--signoff` option in
> git for merge commits, which is a standard part of our workflow with
> feature branches. Here is a workflow where we currently get stuck:
[...]
> Or, I could manually add the Signoff line to the proposed git merge
> commit message, which would allow me to skip the `--amend` step.
Perhaps you could use a prepare-commit-msg hook (or maybe a commit-msg
hook) to automatically add your Signoff line to any commit message if
it isn't there already.
In the prepare-commit-msg hook sample there is already commented out
code to do that:
https://github.com/git/git/blob/master/templates/hooks--prepare-commit-msg.sample#L35-L36
Alternatively you might want to use `git interpret-trailers` to do
that or more fancy trailer related things.
> Could you please add a `--signoff` option to `git merge`?
I am not opposed to add a `--signoff` option to `git merge`, but I
think the main plan to improve git in this area has been to first make
it possible for git commands that can create commits to accept options
like "--trailer 'Signed-off-by: Alice <alice@example.com>'" and to
pass them to `git interpret-trailers` (or its underlying code).
prev parent reply other threads:[~2017-07-25 5:42 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-01 15:24 Request for git merge --signoff Dan Kohn
2017-07-01 17:45 ` Junio C Hamano
2017-07-01 18:15 ` Dan Kohn
2017-07-01 20:25 ` Junio C Hamano
2017-07-01 22:15 ` Ævar Arnfjörð Bjarmason
2017-07-25 5:42 ` Christian Couder [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='CAP8UFD0KoamG88x-vWXPWT-pv8=f-v+fxOKH1=B9NrZrZhTm=g@mail.gmail.com' \
--to=christian.couder@gmail.com \
--cc=dan@linuxfoundation.org \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).