diff options
| author | Patrick Steinhardt <ps@pks.im> | 2024-05-07 04:52:56 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2024-05-07 05:50:48 (GMT) |
| commit | b7afb462258ab02d94e437652cd230a7827d3329 (patch) | |
| tree | 70aab291fbfbe6c21d0dd10770d8c89f6ae03659 /t/t0040-parse-options.sh | |
| parent | 0c6bd2b81d1e18dfa1e143c354c554cca34b3685 (diff) | |
| download | git-b7afb462258ab02d94e437652cd230a7827d3329.zip git-b7afb462258ab02d94e437652cd230a7827d3329.tar.gz git-b7afb462258ab02d94e437652cd230a7827d3329.tar.bz2 | |
parse-options-cb: only abbreviate hashes when hash algo is known
The `OPT__ABBREV()` option can be used to add an option that abbreviates
object IDs. When given a length longer than `the_hash_algo->hexsz`, then
it will instead set the length to that maximum length.
It may not always be guaranteed that we have `the_hash_algo` initialized
properly as the hash algorithm can only be set up after we have set up
`the_repository`. In that case, the hash would always be truncated to
the hex length of SHA1, which may not be what the user desires.
In practice it's not a problem as all commands that use `OPT__ABBREV()`
also have `RUN_SETUP` set and thus cannot work without a repository.
Consequently, both `the_repository` and `the_hash_algo` would be
properly set up.
Regardless of that, harden the code to not truncate the length when we
didn't set up a repository.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t0040-parse-options.sh')
| -rwxr-xr-x | t/t0040-parse-options.sh | 17 |
1 files changed, 17 insertions, 0 deletions
diff --git a/t/t0040-parse-options.sh b/t/t0040-parse-options.sh index 8bb2a8b..45a7736 100755 --- a/t/t0040-parse-options.sh +++ b/t/t0040-parse-options.sh @@ -176,6 +176,23 @@ test_expect_success 'long options' ' test_cmp expect output ' +test_expect_success 'abbreviate to something longer than SHA1 length' ' + cat >expect <<-EOF && + boolean: 0 + integer: 0 + magnitude: 0 + timestamp: 0 + string: (not set) + abbrev: 100 + verbose: -1 + quiet: 0 + dry run: no + file: (not set) + EOF + test-tool parse-options --abbrev=100 >output && + test_cmp expect output +' + test_expect_success 'missing required value' ' cat >expect <<-\EOF && error: switch `s'\'' requires a value |