From: Junio C Hamano <gitster@pobox•com>
To: "Ævar Arnfjörð Bjarmason" <avarab@gmail•com>
Cc: Bagas Sanjaya <bagasdotme@gmail•com>, git@vger•kernel.org
Subject: Re: [PATCH] diff: --pickaxe-all typofix
Date: Wed, 04 Aug 2021 10:36:35 -0700 [thread overview]
Message-ID: <xmqqh7g5p0ws.fsf@gitster.g> (raw)
In-Reply-To: <87o8admdsv.fsf@evledraar.gmail.com> ("Ævar Arnfjörð Bjarmason"'s message of "Wed, 04 Aug 2021 17:26:10 +0200")
Ævar Arnfjörð Bjarmason <avarab@gmail•com> writes:
> 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.
prev parent reply other threads:[~2021-08-04 17:36 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-04 12:24 [PATCH] diff: --pickaxe-all typofix Bagas Sanjaya
2021-08-04 15:26 ` Ævar Arnfjörð Bjarmason
2021-08-04 17:36 ` Junio C Hamano [this message]
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=xmqqh7g5p0ws.fsf@gitster.g \
--to=gitster@pobox$(echo .)com \
--cc=avarab@gmail$(echo .)com \
--cc=bagasdotme@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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