git/list[1] front-page[2] threads[3] people[4] search[5] about
 

Request for git merge --signoff

From
DKDan Kohn <dan@linuxfoundation.org>
Date
Jul 1, 2017, 15:24 UTC
Message-ID
<CAHv71zK5SqbwrBFX=a8-DY9H3KT4FEyMgv__p2gZzNr0WUAPUw@mail.gmail.com>

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:

```sh (master)$ git checkout -b feature-branch # make some changes (feature-branch)$ git commit -sam 'Adding features' # Changes have occurred on master so need to add them for easier merge (feature-branch)$ git fetch (feature-branch)$ git merge origin/master # Save default commit message (feature-branch)$ git push # This now fails the DCObot check because the merge commit is not signed. ```

This alternative workflow works, but is obviously tedious:

```sh # First 3 steps are the same (feature-branch)$ git merge origin/master # Save default commit message (feature-branch)$ git commit --amend -s # Commit message now has signoff line (feature-branch)$ git push # This now passes the DCObot check. ```

Or, I could manually add the Signoff line to the proposed git merge commit message, which would allow me to skip the `--amend` step.

Could you please add a `--signoff` option to `git merge`?

Probot issue reference: https://github.com/probot/dco/issues/13 -- Dan Kohn <mailto:dan@linuxfoundation.org> Executive Director, Cloud Native Computing Foundation <https://cncf.io/> tel:+1-415-233-1000

Next: Junio C Hamano
Message 1 of 6 in “Request for git merge --signoff”
  1. Dan KohnJul 1, 2017
  2. Junio C HamanoJul 1, 2017
  3. Dan KohnJul 1, 2017
  4. Junio C HamanoJul 1, 2017
  5. Ævar Arnfjörð BjarmasonJul 1, 2017
  6. Christian CouderJul 25, 2017

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.