diff options
author | Ævar Arnfjörð Bjarmason <avarab@gmail.com> | 2021-04-12 20:15:15 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-05-11 06:47:31 +0300 |
commit | d26ec8800969ea1b692e0c87100dc4235cfa12e2 (patch) | |
tree | 52500f01b7ae76b9706ec15fc5ae71134d73e0a4 /t/t4209-log-pickaxe.sh | |
parent | 188e9e28c5287f3f160b5f14e3e551b1c55c7301 (diff) |
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 't/t4209-log-pickaxe.sh')
-rwxr-xr-x | t/t4209-log-pickaxe.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index 772c6c1a7c..16166ffd3e 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -63,6 +63,9 @@ test_expect_success 'usage' ' grep "mutually exclusive" err && test_expect_code 128 git log -Sstring --find-object=HEAD 2>err && + grep "mutually exclusive" err && + + test_expect_code 128 git log --pickaxe-all --find-object=HEAD 2>err && grep "mutually exclusive" err ' |