Re: [PATCH v2] pull: pass --signoff/--no-signoff to "git merge"

From: W. Trevor King <wking@tremily.us>
Date: Oct 12, 2017, 09:18 UTC
Message-ID: <20171012091822.GA27403@valgrind.us>
In-Reply-To: <51d67d6d707182d4973d9961ab29358f26c4988a.1507796638.git.wking@tremily.us>

On Thu, Oct 12, 2017 at 01:46:39AM -0700, W. Trevor King wrote:

> The order of options in merge-options.txt isn't clear to me, but
> I've put --signoff between --log and --stat as somewhat alphabetized
> and having an "add to the commit message" function like --log.

The order of options in merge-options.txt was intended to be by "alphabetical groups", at least back in 7c85d274 (Documentation/merge-options.txt: order options in alphabetical groups, 2009-10-22). I'm not quite clear on what that means. After 7c85d274 landed there were already long-option irregularities:

  $ git grep -h ^-- 7c85d27 -- Documentation/merge-options.txt
  --commit::
  --no-commit::
  --ff::
  --no-ff::
  --log::
  --no-log::
  --stat::
  --no-stat::
  --squash::
  --no-squash::
  --strategy=<strategy>::
  --summary::
  --no-summary::
  --quiet::
  --verbose::

If the order was purely alphabetical, --stat/--no-stat should have after --squash/--no-squash, and --quiet should have been much earlier. And putting --signoff after --log is still alphabetical in v2.15.0-rc1 (ignoring a few outliers). So I don't think it's a reason to change where I'd put the option, but in v3 of this patch I'll update the commit message to cite 7c85d274 when motivating the location.

Cheers, Trevor

-- 
This email may be signed or encrypted with GnuPG (http://www.gnupg.org).
For more information, see http://en.wikipedia.org/wiki/Pretty_Good_Privacy