pickaxe: die when --find-object and --pickaxe-all are combined
Neither the --pickaxe-all documentation nor --find-object's has ever suggested that you can combine the two. See f506b8e8b5 (git log/diff: add -G<regexp> that greps in the patch text, 2010-08-23) and 15af58c1ad (diffcore: add a pickaxe option to find a specific blob, 2018-01-04). But we've silently tolerated it, which makes the logic in diffcore_pickaxe() harder to reason about. Let's assert that we won't have the two combined. Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Ævar Arnfjörð Bjarmason committed
Apr 12, 2021 at 19:15 UTC
d26ec8800969ea1b692e0c87100dc4235cfa12e2
3 files changed
+8
diff.c
+3
@@ -4631,6 +4631,9 @@ void diff_setup_done(struct diff_options *options)
4631
if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK))
4632
die(_("-G and --pickaxe-regex are mutually exclusive, use --pickaxe-regex with -S"));
4633
4634
+ if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK))
4635
+ die(_("---pickaxe-all and --find-object are mutually exclusive, use --pickaxe-all with -G and -S"));
4636
+
4637
/*
4638
* Most of the time we can say "there are changes"
4639
* only by checking if there are changed paths, but
diff.h
+2
@@ -558,6 +558,8 @@ int git_config_rename(const char *var, const char *value);
558
DIFF_PICKAXE_KIND_OBJFIND)
559
#define DIFF_PICKAXE_KINDS_G_REGEX_MASK (DIFF_PICKAXE_KIND_G | \
560
DIFF_PICKAXE_REGEX)
561
+#define DIFF_PICKAXE_KINDS_ALL_OBJFIND_MASK (DIFF_PICKAXE_ALL | \
562
+ DIFF_PICKAXE_KIND_OBJFIND)
563
564
#define DIFF_PICKAXE_IGNORE_CASE 32
565
t/t4209-log-pickaxe.sh
+3
@@ -63,6 +63,9 @@ test_expect_success 'usage' '
63
grep "mutually exclusive" err &&
64
65
test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
66
+ grep "mutually exclusive" err &&
67
+
68
+ test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err &&
69
grep "mutually exclusive" err
70
'
71