]> git.ipfire.org Git - thirdparty/git.git/commitdiff
pickaxe tests: add missing test for --no-pickaxe-regex being an error
authorÆvar Arnfjörð Bjarmason <avarab@gmail.com>
Mon, 12 Apr 2021 17:15:13 +0000 (19:15 +0200)
committerJunio C Hamano <gitster@pobox.com>
Tue, 11 May 2021 03:47:31 +0000 (12:47 +0900)
Add a missing test for --no-pickaxe-regex. This has been an error ever
since before the -S or -G options were added, or since
7ae0b0cb65f (git-log (internal): more options., 2006-03-01).

The reason for adding this test is that Junio suggested in [1] in
response to a later test addition in this series that it might be good
to support --no-pickaxe-regex in combination with -G. This would allow
for fixed-string searching with -G, similr to grep's --fixed-strings
mode.

I agree that that would make sense if anyone would like to implement
it, but since it dies right now let's first add this test to assert
the existing long-standing behavior. We can always add support for
--[no-]pickaxe-regex in combination with -G at some later date.

1. http://lore.kernel.org/git/xmqqwnto9pt7.fsf@gitster.g

Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t4209-log-pickaxe.sh

index 21e22af1e7ee94b5e9202c794f0e7bda671c04e1..532bb875f02f4cc8860c6cf9e7afb5eb01d56f43 100755 (executable)
@@ -66,6 +66,18 @@ test_expect_success 'usage' '
        grep "mutually exclusive" err
 '
 
+test_expect_success 'usage: --no-pickaxe-regex' '
+       cat >expect <<-\EOF &&
+       fatal: unrecognized argument: --no-pickaxe-regex
+       EOF
+
+       test_expect_code 128 git log -Sstring --no-pickaxe-regex 2>actual &&
+       test_cmp expect actual &&
+
+       test_expect_code 128 git log -Gstring --no-pickaxe-regex 2>err &&
+       test_cmp expect actual
+'
+
 test_log       expect_initial  --grep initial
 test_log       expect_nomatch  --grep InItial
 test_log_icase expect_initial  --grep InItial