diff options
| author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-12 19:15:15 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 05:47:31 +0200 |
| commit | d26ec8800969ea1b692e0c87100dc4235cfa12e2 (patch) | |
| tree | 52500f01b7ae76b9706ec15fc5ae71134d73e0a4 /diff.c | |
| parent | pickaxe: die when -G and --pickaxe-regex are combined (diff) | |
| download | git-d26ec8800969ea1b692e0c87100dc4235cfa12e2.tar.xz git-d26ec8800969ea1b692e0c87100dc4235cfa12e2.zip | |
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>
Diffstat (limited to 'diff.c')
| -rw-r--r-- | diff.c | 3 |
1 files changed, 3 insertions, 0 deletions
@@ -4631,6 +4631,9 @@ void diff_setup_done(struct diff_options *options) if (HAS_MULTI_BITS(options->pickaxe_opts & DIFF_PICKAXE_KINDS_G_REGEX_MASK)) 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")); + /* * Most of the time we can say "there are changes" * only by checking if there are changed paths, but |