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

Re: [PATCH 1/3] format-patch: refactor output selection

From
Eric Sunshine <sunshine@sunshineco.com>
Date
Nov 4, 2020, 17:01 UTC
Message-ID
<CAPig+cRG4uPL1TDpEOgOZwSEJfyt-d0XmsVz3hcCebgwbO_v_A@mail.gmail.com>
In-Reply-To
<20201104132522.GA3030146@coredump.intra.peff.net>
On Wed, Nov 4, 2020 at 8:25 AM Jeff King <peff@peff.net> wrote:
Show 17 quoted lines
> The --stdout and --output-directory options are mutually exclusive, but
> it's hard to tell from reading the code. We have three separate
> conditionals that check for use_stdout, and it's only after we've set up
> the output_directory fully that we check whether the user also specified
> --stdout.
>
> Instead, let's check the exclusion explicitly first, then have a single
> conditional that handles stdout versus an output directory. This is
> slightly easier to follow now, and also will keep things sane when we
> add another output mode in a future patch.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> diff --git a/builtin/log.c b/builtin/log.c
> @@ -1942,20 +1942,20 @@ int cmd_format_patch(int argc, const char **argv, const char *prefix)
> +       if (use_stdout + !!output_directory > 1)
> +               die(_("specify only one of --stdout, --output, and --output-directory"));

Is mention of --output intentional here? The commit message only talks about --stdout and --output-directory.

It's subjective, but "mutually exclusive" sounds a bit more consistent with other similar error messages elsewhere:

    --stdout, --output, and --output-directory are mutually exclusive
Previous: Jeff KingNext: Jeff King
Message 4 of 17 in “[Bug report] Crash when creating patch”
  1. Johannes PostlerNov 4, 2020
  2. Jeff KingNov 4, 2020
  3. 1/3 format-patch: refactor output selectionJeff King, Nov 4, 2020
  4. Eric SunshineNov 4, 2020
  5. Jeff KingNov 4, 2020
  6. 2/3 format-patch: tie file-opening logic to output_directoryJeff King, Nov 4, 2020
  7. Eric SunshineNov 4, 2020
  8. 3/3 format-patch: support --output optionJeff King, Nov 4, 2020
  9. Eric SunshineNov 4, 2020
  10. Jeff KingNov 4, 2020
  11. Eric SunshineNov 4, 2020
  12. Junio C HamanoNov 4, 2020
  13. format-patch --outputJeff King, Nov 4, 2020
  14. 1/3 format-patch: refactor output selectionJeff King, Nov 4, 2020
  15. 2/3 format-patch: tie file-opening logic to output_directoryJeff King, Nov 4, 2020
  16. 3/3 format-patch: support --output optionJeff King, Nov 4, 2020
  17. Johannes PostlerNov 5, 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.