diff options
| author | Taylor Blau <me@ttaylorr.com> | 2025-06-23 18:32:10 -0400 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-06-23 15:41:35 -0700 |
| commit | 798ddd947ffe9d608d9aa5803dc7c409834e7159 (patch) | |
| tree | 2e177bde694e2a806ba8e69b0a2bef99007867c7 /t/t5331-pack-objects-stdin.sh | |
| parent | f9aa0eedb37eb94d9d3711ef0d565fd7cb3b6148 (diff) | |
| download | git-798ddd947ffe9d608d9aa5803dc7c409834e7159.tar.gz | |
pack-objects: use standard option incompatibility functions
pack-objects has a handful of explicit checks for pairs of command-line
options which are mutually incompatible. Many of these pre-date
a699367bb8 (i18n: factorize more 'incompatible options' messages,
2022-01-31).
Convert the explicit checks into die_for_incompatible_opt2() calls,
which simplifies the implementation and standardizes pack-objects'
output when given incompatible options (e.g., --stdin-packs with
--filter gives different output than --keep-unreachable with
--unpack-unreachable).
There is one minor piece of test fallout in t5331 that expects the old
format, which has been corrected.
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5331-pack-objects-stdin.sh')
| -rwxr-xr-x | t/t5331-pack-objects-stdin.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t5331-pack-objects-stdin.sh b/t/t5331-pack-objects-stdin.sh index b48c0cbe8f..8fd07deb8d 100755 --- a/t/t5331-pack-objects-stdin.sh +++ b/t/t5331-pack-objects-stdin.sh @@ -64,7 +64,7 @@ test_expect_success '--stdin-packs is incompatible with --filter' ' cd stdin-packs && test_must_fail git pack-objects --stdin-packs --stdout \ --filter=blob:none </dev/null 2>err && - test_grep "cannot use --filter with --stdin-packs" err + test_grep "options .--stdin-packs. and .--filter. cannot be used together" err ) ' |