{"thread":{"id":"56213","subject":"[PATCH] diff: --pickaxe-all typofix","startedAt":"2021-08-04T12:25:14Z","lastAt":"2021-08-04T17:36:39Z","messageCount":3,"participants":["Bagas Sanjaya","Ævar Arnfjörð Bjarmason","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"431952","messageId":"20210804122419.53968-1-bagasdotme@gmail.com","threadId":"56213","inReplyTo":null,"subject":"[PATCH] diff: --pickaxe-all typofix","fromName":"Bagas Sanjaya","fromEmail":"bagasdotme@gmail.com","sentAt":"2021-08-04T12:24:20Z","receivedAt":"2021-08-04T12:25:14Z","isPatch":true,"sender":{"key":"bagasdotme@gmail.com","avatar":"https://avatars.githubusercontent.com/u/40219486?v=4"},"body":"When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round,\nI noticed a triple-dash typo (--pickaxe-all) at diff.c, which according\nto git-diff(1) manpage, the correct option name should be --pickaxe-all.\n\nFix the typo.\n\nSigned-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n---\n diff.c | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/diff.c b/diff.c\nindex 82f88de755..a8113f1707 100644\n--- a/diff.c\n+++ b/diff.c\n@@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)\n \t\tdie(_(\"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S\"));\n \n \tif (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))\n-\t\tdie(_(\"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n+\t\tdie(_(\"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n \n \t/*\n \t * Most of the time we can say \"there are changes\"\n\nbase-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd\n-- \n2.25.1\n\n"},{"id":"431961","messageId":"87o8admdsv.fsf@evledraar.gmail.com","threadId":"56213","inReplyTo":"20210804122419.53968-1-bagasdotme@gmail.com","subject":"Re: [PATCH] diff: --pickaxe-all typofix","fromName":"Ævar Arnfjörð Bjarmason","fromEmail":"avarab@gmail.com","sentAt":"2021-08-04T15:26:10Z","receivedAt":"2021-08-04T15:26:29Z","isPatch":true,"sender":{"key":"avarab@gmail.com","avatar":"https://avatars.githubusercontent.com/u/45301?v=4"},"body":"\nOn Wed, Aug 04 2021, Bagas Sanjaya wrote:\n\n> When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round,\n> I noticed a triple-dash typo (--pickaxe-all) at diff.c, which according\n> to git-diff(1) manpage, the correct option name should be --pickaxe-all.\n>\n> Fix the typo.\n>\n> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n> ---\n>  diff.c | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/diff.c b/diff.c\n> index 82f88de755..a8113f1707 100644\n> --- a/diff.c\n> +++ b/diff.c\n> @@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)\n>  \t\tdie(_(\"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S\"));\n>  \n>  \tif (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))\n> -\t\tdie(_(\"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n> +\t\tdie(_(\"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n>  \n>  \t/*\n>  \t * Most of the time we can say \"there are changes\"\n>\n> base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd\n\nThanks, that's my typo from d26ec880096 (pickaxe: die when --find-object\nand --pickaxe-all are combined, 2021-04-12) and this fix looks good to\nme, sorry about that.\n"},{"id":"431968","messageId":"xmqqh7g5p0ws.fsf@gitster.g","threadId":"56213","inReplyTo":"87o8admdsv.fsf@evledraar.gmail.com","subject":"Re: [PATCH] diff: --pickaxe-all typofix","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2021-08-04T17:36:35Z","receivedAt":"2021-08-04T17:36:39Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Ævar Arnfjörð Bjarmason <avarab@gmail.com> writes:\n\n> On Wed, Aug 04 2021, Bagas Sanjaya wrote:\n>\n>> When I was fixing fuzzies as I updating po/id.po for 2.33.0 l10n round,\n>> I noticed a triple-dash typo (--pickaxe-all) at diff.c, which according\n>> to git-diff(1) manpage, the correct option name should be --pickaxe-all.\n>>\n>> Fix the typo.\n>>\n>> Signed-off-by: Bagas Sanjaya <bagasdotme@gmail.com>\n>> ---\n>>  diff.c | 2 +-\n>>  1 file changed, 1 insertion(+), 1 deletion(-)\n>>\n>> diff --git a/diff.c b/diff.c\n>> index 82f88de755..a8113f1707 100644\n>> --- a/diff.c\n>> +++ b/diff.c\n>> @@ -4640,7 +4640,7 @@ void diff_setup_done(struct diff_options *options)\n>>  \t\tdie(_(\"-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S\"));\n>>  \n>>  \tif (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))\n>> -\t\tdie(_(\"---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n>> +\t\tdie(_(\"--pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S\"));\n>>  \n>>  \t/*\n>>  \t * Most of the time we can say \"there are changes\"\n>>\n>> base-commit: 66262451ec94d30ac4b80eb3123549cf7a788afd\n>\n> Thanks, that's my typo from d26ec880096 (pickaxe: die when --find-object\n> and --pickaxe-all are combined, 2021-04-12) and this fix looks good to\n> me, sorry about that.\n\nThanks for a timely fix, as this is a mini-breakage we gained during\nthis cycle.\n"}]}