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

Re: [PATCH 1/2] combine-diff: abort if --ignore-matching-lines is given

From
Junio C Hamano <gitster@pobox.com>
Date
Jun 21, 2022, 16:55 UTC
Message-ID
<xmqqsfnygdlz.fsf@gitster.g>
In-Reply-To
<95d7609e-4cb5-c87e-0120-144f1f094241@web.de>
René Scharfe <l.s.r@web.de> writes:
Show 9 quoted lines
>>> +	if (opt->ignore_regex_nr)
>>> +		die("combined diff and '%s' cannot be used together",
>>> +		    "--ignore-matching-lines");
>>
>> "X cannot be used together _with_ Y" perhaps?
>
> Not sure, but that type of message was recently unified (most common
> case: "options '%s' and '%s' cannot be used together") and "with" is
> only used in an untranslated BUG:

Ah, sorry, I completely misread the original as "combined diff cannot be used together with ignore-matching-lines".

Sorry for the noise.
Previous: René ScharfeNext: René Scharfe
Message 11 of 12 in “Bug: combined diff with --ignore-matching-lines”
  1. René ScharfeMay 14, 2022
  2. diff: fix a segfault in >2 tree -I<regex> and --output=<file>Ævar Arnfjörð Bjarmason, May 23, 2022
  3. Junio C HamanoMay 23, 2022
  4. Ævar Arnfjörð BjarmasonMay 24, 2022
  5. Junio C HamanoMay 24, 2022
  6. Ævar Arnfjörð BjarmasonMay 24, 2022
  7. René ScharfeJun 18, 2022
  8. 1/2 combine-diff: abort if --ignore-matching-lines is givenRené Scharfe, Jun 18, 2022
  9. Junio C HamanoJun 21, 2022
  10. René ScharfeJun 21, 2022
  11. Junio C HamanoJun 21, 2022
  12. 2/2 combine-diff: abort if --output is givenRené Scharfe, Jun 18, 2022

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.