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

Re: [PATCH] format-patch: cancel useAutoBase if base is invalid

From
Junio C Hamano <gitster@pobox.com>
Date
Sep 17, 2020, 00:26 UTC
Message-ID
<xmqqr1r1tfil.fsf@gitster.c.googlers.com>
In-Reply-To
<20200916234916.422553-1-jacob.e.keller@intel.com>
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...

Next: Junio C Hamano
Message 1 of 4 in “Re: [PATCH] format-patch: cancel useAutoBase if base is invalid”
  1. Junio C HamanoSep 17, 2020
  2. Junio C HamanoSep 17, 2020
  3. Jacob KellerSep 17, 2020
  4. Junio C HamanoSep 18, 2020

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.