git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: Phillip Wood <phillip.wood@talktalk.net>,
	Git Mailing List <git@vger.kernel.org>,
	Phillip Wood <phillip.wood@dunelm.org.uk>
Subject: Re: [PATCH 1/2] rebase: support --signoff with implicit rebase
Date: Thu, 15 Mar 2018 11:11:51 +0100 (STD)	[thread overview]
Message-ID: <nycvar.QRO.7.76.6.1803151110340.20700@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz> (raw)
In-Reply-To: <xmqqh8pizgxg.fsf@gitster-ct.c.googlers.com>

Hi Junio,

On Wed, 14 Mar 2018, Junio C Hamano wrote:

> Phillip Wood <phillip.wood@talktalk.net> writes:
> 
> > From: Phillip Wood <phillip.wood@dunelm.org.uk>
> >
> > This allows one to run 'git rebase --exec "make check" --signoff'
> > which is useful when preparing a patch series for publication and is
> > more convenient than doing the signoff with another --exec command.
> > This change also allows --root without --onto to work with --signoff
> > as well (--root with --onto was already supported). Note that the
> > failing test is due to a bug in 'rebase --root' when the root commit
> > is empty which will be fixed in the next commit.
> >
> > Signed-off-by: Phillip Wood <phillip.wood@dunelm.org.uk>
> > ---
> 
> How important is the word "implicit" in the title?  Is it your
> intention to actively ignore --signoff when we fall into the
> rebase--interactive codepath explicitly?

The patch makes the explicit case fail ;-)

> I offhand do not think of a strong reason why it is a bad idea to
> run "git rebase -i --signoff", turn a few "pick" to either "reword"
> or "edit", and then expect that the editor to edit log messages for
> these commits to add your sign-off when you start editing them.
> The "pick"s that are left as-is would also turn into doing an
> otherwise no-op "commit --amend -s", I guess.
> 
> If you are teaching --signoff to the whole of "rebase--interactive",
> then "git rebase --help" needs a bit of update.
> 
>     --signoff::
>             This flag is passed to 'git am' to sign off all the rebased
>             commits (see linkgit:git-am[1]). Incompatible with the
>             --interactive option.

Good point. I'd actually be in favor of having all rebase modes support
--signoff, but I do not want to pile onto Phillip's workload.

Ciao,
Dscho

  reply	other threads:[~2018-03-15 10:12 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-14 11:11 Phillip Wood
2018-03-14 11:11 ` [PATCH 2/2] rebase --root -k: fix when root commit is empty Phillip Wood
2018-03-15 10:28   ` Johannes Schindelin
2018-03-15 10:59   ` Phillip Wood
2018-03-14 17:48 ` [PATCH 1/2] rebase: support --signoff with implicit rebase Junio C Hamano
2018-03-15 10:11   ` Johannes Schindelin [this message]
2018-03-15 10:18 ` Johannes Schindelin
2018-03-15 10:55   ` Phillip Wood
2018-03-16 12:36     ` Johannes Schindelin
2018-03-20 11:10 ` [PATCH v2 0/3] rebase: extend --signoff support Phillip Wood
2018-03-20 11:10   ` [PATCH v2 1/3] " Phillip Wood
2018-03-20 11:10   ` [PATCH v2 2/3] rebase -p: error out if --signoff is given Phillip Wood
2018-03-20 11:10   ` [PATCH v2 3/3] rebase --keep-empty: always use interactive rebase Phillip Wood
2018-03-20 16:08     ` Johannes Schindelin
2018-03-20 18:44       ` Phillip Wood

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=nycvar.QRO.7.76.6.1803151110340.20700@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz \
    --to=johannes.schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=phillip.wood@talktalk.net \
    --subject='Re: [PATCH 1/2] rebase: support --signoff with implicit rebase' \
    /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

Code repositories for project(s) associated with this 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).