[PATCH v3] abbrev: allow extending beyond 32 chars to disambiguate
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Aug 14, 2025, 15:09 UTC
- Message-ID
- <xmqqh5ya6iua.fsf_-_@gitster.g>
- In-Reply-To
- <xmqqzfc51xvk.fsf@gitster.g>
When you have two or more objects with object names that share more than 32 letters in an SHA-1 repository, find_unique_abbrev() fails to show disambiguation.
To see how many leading letters of a given full object name is sufficiently unambiguous, the algorithm starts from a initial length, guessed based on the estimated number of objects in the repository, and see if another object that shares the prefix, and keeps extending the abbreviation. The loop stops at GIT_MAX_RAWSZ, which is counted as the number of bytes, since 5b20ace6 (sha1_name: unroll len loop in find_unique_abbrev_r(), 2017-10-08); before that change, it extended up to GIT_SHA1_HEXSZ, which meant to stop at the end of hexadecimal SHA-1 object name.
Because the hexadecimal object name passed to the function is NUL-terminated, and this fact is used to correctly terminate the loop that scans for the first difference earlier in the function, use it to make sure we do not increment the .cur_len member beyond the end of the string.
Noticed-by: Jon Forrest <nobozo@gmail.com> Helped-by: René Scharfe <l.s.r@web.de> Signed-off-by: Junio C Hamano <gitster@pobox.com> ---
* To tie the loose ends, here is what is in 'seen'. We may want to merge it down once 2.51 final gets tagged.
object-name.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/object-name.c b/object-name.c index 11aa0e6afc..4cd1d38778 100644 --- a/object-name.c +++ b/object-name.c @@ -704,7 +704,7 @@ static int extend_abbrev_len(const struct object_id *oid, void *cb_data) while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i)) i++; - if (i < GIT_MAX_RAWSZ && i >= mad->cur_len) + if (mad->hex[i] && i >= mad->cur_len) mad->cur_len = i + 1; return 0;
-- 2.51.0-rc2-158-gf97fc618fa