Skip to content

Commit 064952f

Browse files
avargitster
authored andcommitted
pickaxe tests: test for -G, -S and --find-object incompatibility
Add a test for the options sanity check added in 5e50525 (diff: properly error out when combining multiple pickaxe options, 2018-01-04). Signed-off-by: Ævar Arnfjörð Bjarmason <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 69ae930 commit 064952f

File tree

1 file changed

+11
-0
lines changed

1 file changed

+11
-0
lines changed

t/t4209-log-pickaxe.sh

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,17 @@ test_expect_success setup '
5555
git rev-parse --verify HEAD >expect_second
5656
'
5757

58+
test_expect_success 'usage' '
59+
test_expect_code 128 git log -Gregex -Sstring 2>err &&
60+
grep "mutually exclusive" err &&
61+
62+
test_expect_code 128 git log -Gregex --find-object=HEAD 2>err &&
63+
grep "mutually exclusive" err &&
64+
65+
test_expect_code 128 git log -Sstring --find-object=HEAD 2>err &&
66+
grep "mutually exclusive" err
67+
'
68+
5869
test_log expect_initial --grep initial
5970
test_log expect_nomatch --grep InItial
6071
test_log_icase expect_initial --grep InItial

0 commit comments

Comments
 (0)