git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Jacob Keller <jacob.e.keller@intel.com>
Cc: git@vger.kernel.org, Jacob Keller <jacob.keller@gmail.com>
Subject: Re: [PATCH] format-patch: cancel useAutoBase if base is invalid
Date: Wed, 16 Sep 2020 17:26:26 -0700	[thread overview]
Message-ID: <xmqqr1r1tfil.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20200916234916.422553-1-jacob.e.keller@intel.com> (Jacob Keller's message of "Wed, 16 Sep 2020 16:49:16 -0700")

Jacob Keller <jacob.e.keller@intel.com> writes:

> Make get_base_commit detect when useAutoBase is set, and avoid failing
> if the base commit is picked up automatically. We still attempt to fail
> if --base=auto is explicitly requested on the command line.

Makes sense.  I also think we should fail in such a broken base is
chosen, when useAutoBase is set by configuration and is not
overriden from the command line with an explicit use of --no-base
option, because the end-user expects an appropriate base to be used
that is computed automatically, but we are failing to find such a
base---going ahead silently in such a case would be wrong.

> Unfortunately, at least with how --base is handled by the option parsing
> now, if useAutoBase is true *and* --base=auto is provided, we'll still
> cancel the base option instead of failing.

If we are doing the usual "prime with configuration variables and
then override from the commnad line option" thing, then you cannot
tell these two cases apart, but I happen to think that it is better
to fail (and not to ignore silently) consistently whether the
"compute an appropriate base automatically" came from config or
command line, so...

       reply	other threads:[~2020-09-17  0:33 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
     [not found] <20200916234916.422553-1-jacob.e.keller@intel.com>
2020-09-17  0:26 ` Junio C Hamano [this message]
2020-09-17  0:43   ` [PATCH] format-patch: cancel useAutoBase if base is invalid Junio C Hamano
2020-09-17 19:26   ` Jacob Keller
2020-09-18  0:04     ` Junio C Hamano

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqqr1r1tfil.fsf@gitster.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=jacob.e.keller@intel.com \
    --cc=jacob.keller@gmail.com \
    /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.
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 NNTP newsgroup(s).