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 12:47:31 +0900 |
| commit | d26ec8800969ea1b692e0c87100dc4235cfa12e2 (patch) | |
| tree | 52500f01b7ae76b9706ec15fc5ae71134d73e0a4 /diffcore-pickaxe.c | |
| parent | pickaxe: die when -G and --pickaxe-regex are combined (diff) | |
| download | git-d26ec8800969ea1b692e0c87100dc4235cfa12e2.tar.gz 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 'diffcore-pickaxe.c')
0 files changed, 0 insertions, 0 deletions