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

Ævar Arnfjörð Bjarmason [off-list ref] writes:

On Wed, Aug 04 2021, Bagas Sanjaya wrote:

quoted

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 <redacted>
---
 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.