From: Ævar Arnfjörð Bjarmason Date: Mon, 12 Apr 2021 17:15:12 +0000 (+0200) Subject: pickaxe tests: test for -G, -S and --find-object incompatibility X-Git-Tag: v2.33.0-rc0~66^2~17 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=064952fc34b9765282fec057b3af260eae7c75c6;p=thirdparty%2Fgit.git pickaxe tests: test for -G, -S and --find-object incompatibility Add a test for the options sanity check added in 5e505257f2 (diff: properly error out when combining multiple pickaxe options, 2018-01-04). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- diff --git a/t/t4209-log-pickaxe.sh b/t/t4209-log-pickaxe.sh index 9fa770b5fb..21e22af1e7 100755 --- a/t/t4209-log-pickaxe.sh +++ b/t/t4209-log-pickaxe.sh @@ -55,6 +55,17 @@ test_expect_success setup ' git rev-parse --verify HEAD >expect_second ' +test_expect_success 'usage' ' + test_expect_code 128 git log -Gregex -Sstring 2>err && + grep "mutually exclusive" err && + + test_expect_code 128 git log -Gregex --find-object=HEAD 2>err && + grep "mutually exclusive" err && + + test_expect_code 128 git log -Sstring --find-object=HEAD 2>err && + grep "mutually exclusive" err +' + test_log expect_initial --grep initial test_log expect_nomatch --grep InItial test_log_icase expect_initial --grep InItial