development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-11-05 01:58:18 +00:00
Code Issues Projects Releases Packages Wiki Activity

parse-options-cb: stop clamping "--abbrev=" to hash length

Browse source 
The `OPT__ABBREV()` option allows the user to specify the length that
object hashes shall be abbreviated to. This length needs to be in the
range of `(MIN_ABBREV, the_hash_algo->hexsz)`, which is why we clamp the
value as required. While this makes sense in the case of `MIN_ABBREV`,
it is unnecessary for the upper boundary as the value is eventually
passed down to `repo_find_unnique_abbrev_r()`, which handles values
larger than the current hash length just fine.

In the preceding commit, we have changed parsing of the "core.abbrev"
config to stop clamping to the upper boundary. Let's do the same here so
that the code becomes simpler, we are consistent with how we treat the
"core.abbrev" config and so that we stop depending on `the_repository`.

Signed-off-by: Patrick Steinhardt <ps@pks.im>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Patrick Steinhardt 2024-06-12 10:03:31 +02:00 committed by Junio C Hamano
parent 524c0183c9
commit 59ff92c516
2 changed files with 12 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
parse-options-cb.c
View file

@ -30,8 +30,6 @@ int parse_opt_abbrev_cb(const struct option *opt, const char *arg, int unset)
opt->long_name);
if (v && v < MINIMUM_ABBREV)
v = MINIMUM_ABBREV;
else if (startup_info->have_repository && v > the_hash_algo->hexsz)
v = the_hash_algo->hexsz;
}
*(int *)(opt->value) = v;
return 0;

12
t/t4202-log.sh
View file

@ -1243,12 +1243,24 @@ test_expect_success '--abbrev-commit with core.abbrev=false' '
test_cmp expect actual
'
test_expect_success '--abbrev-commit with --no-abbrev' '
git log --no-abbrev >expect &&
git log --abbrev-commit --no-abbrev >actual &&
test_cmp expect actual
'
test_expect_success '--abbrev-commit with core.abbrev=9000' '
git log --no-abbrev >expect &&
git -c core.abbrev=9000 log --abbrev-commit >actual &&
test_cmp expect actual
'
test_expect_success '--abbrev-commit with --abbrev=9000' '
git log --no-abbrev >expect &&
git log --abbrev-commit --abbrev=9000 >actual &&
test_cmp expect actual
'
test_expect_success 'show added path under "--follow -M"' '
# This tests for a regression introduced in v1.7.2-rc0~103^2~2
test_create_repo regression &&