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

Re: [PATCH] diff: --pickaxe-all typofix

From
Junio C Hamano <gitster@pobox.com>
Date
Aug 4, 2021, 17:36 UTC
Message-ID
<xmqqh7g5p0ws.fsf@gitster.g>
In-Reply-To
<87o8admdsv.fsf@evledraar.gmail.com>
Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:
Show 32 quoted lines
> On Wed, Aug 04 2021, Bagas Sanjaya wrote:
>
>> When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round,
>> I noticed a triple-dash typo (--pickaxe-all) at diff.c, which according
>> to git-diff(1) manpage, the correct option name should be --pickaxe-all.
>>
>> Fix the typo.
>>
>> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>
>> ---
>>  diff.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/diff.c b/diff.c
>> index 82f88de755..a8113f1707 100644
>> --- a/diff.c
>> +++ b/diff.c
>> @@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)
>>  		die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"));
>>  
>>  	if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
>> -		die(_("---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
>> +		die(_("--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
>>  
>>  	/*
>>  	 * Most of the time we can say "there are changes"
>>
>> base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd
>
> Thanks, that's my typo from d26ec880096 (pickaxe: die when --find-object
> and --pickaxe-all are combined, 2021-04-12) and this fix looks good to
> me, sorry about that.

Thanks for a timely fix, as this is a mini-breakage we gained during this cycle.

Previous: Ævar Arnfjörð Bjarmason
Message 3 of 3 in “diff: --pickaxe-all typofix”
  1. diff: --pickaxe-all typofixBagas Sanjaya, Aug 4, 2021
  2. Ævar Arnfjörð BjarmasonAug 4, 2021
  3. Junio C HamanoAug 4, 2021

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.