Merge branch 'jk/for-each-reflog-ent-reverse' into maint

diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh
index 919b371169ac6c1eb3010f7bafa2685c19109013..844df760f7d1c2b1b25eb01fada039efd0354711 100755 (executable)
--- a/t/t4209-log-pickaxe.sh
+++ b/t/t4209-log-pickaxe.sh
@@ -55,30 +55,15 @@ test_expect_success setup '
        git rev-parse --verify HEAD >expect_second
 '
 
-test_expect_success 'log --grep' '
-       git log --grep=initial --format=%H >actual &&
-       test_cmp expect_initial actual
-'
+test_log       expect_initial  --grep initial
+test_log       expect_nomatch  --grep InItial
+test_log_icase expect_initial  --grep InItial
+test_log_icase expect_nomatch  --grep initail
 
-test_expect_success 'log --grep --regexp-ignore-case' '
-       git log --regexp-ignore-case --grep=InItial --format=%H >actual &&
-       test_cmp expect_initial actual
-'
-
-test_expect_success 'log --grep -i' '
-       git log -i --grep=InItial --format=%H >actual &&
-       test_cmp expect_initial actual
-'
-
-test_expect_success 'log --author --regexp-ignore-case' '
-       git log --regexp-ignore-case --author=person --format=%H >actual &&
-       test_cmp expect_second actual
-'
-
-test_expect_success 'log --author -i' '
-       git log -i --author=person --format=%H >actual &&
-       test_cmp expect_second actual
-'
+test_log       expect_second   --author Person
+test_log       expect_nomatch  --author person
+test_log_icase expect_second   --author person
+test_log_icase expect_nomatch  --author spreon
 
 test_log       expect_nomatch  -G picked
 test_log       expect_second   -G Picked
@@ -103,6 +88,11 @@ test_log    expect_second   -S Picked
 test_log_icase expect_second   -S picked
 test_log_icase expect_nomatch  -S pickle
 
+test_log       expect_nomatch  -S p.cked --pickaxe-regex
+test_log       expect_second   -S P.cked --pickaxe-regex
+test_log_icase expect_second   -S p.cked --pickaxe-regex
+test_log_icase expect_nomatch  -S p.ckle --pickaxe-regex
+
 test_expect_success 'log -S --textconv (missing textconv tool)' '
        echo "* diff=test" >.gitattributes &&
        test_must_fail git -c diff.test.textconv=missing log -Sfoo &&