File tree Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Expand file tree Collapse file tree 1 file changed +16
-0
lines changed Original file line number Diff line number Diff line change @@ -479,6 +479,22 @@ test_expect_success 'log grep (6)' '
479
479
test_cmp expect actual
480
480
'
481
481
482
+ test_expect_success ' log with multiple --grep uses union' '
483
+ git log --grep=i --grep=r --format=%s >actual &&
484
+ {
485
+ echo fourth && echo third && echo initial
486
+ } >expect &&
487
+ test_cmp expect actual
488
+ '
489
+
490
+ test_expect_success ' log --all-match with multiple --grep uses intersection' '
491
+ git log --all-match --grep=i --grep=r --format=%s >actual &&
492
+ {
493
+ echo third
494
+ } >expect &&
495
+ test_cmp expect actual
496
+ '
497
+
482
498
test_expect_success ' log --grep --author implicitly uses all-match' '
483
499
# grep matches initial and second but not third
484
500
# author matches only initial and third
You can’t perform that action at this time.
0 commit comments