Skip to content

Commit c5ab5e5

Browse files
committed
Merge branch 'jc/longer-disambiguation-fix' into seen
"git rev-parse --short" and friends failed to disambiguate two objects with object names that share common prefix longer than 32 characters. * jc/longer-disambiguation-fix: abbrev: allow extending beyond 32 chars to disambiguate
2 parents 4c3afe3 + 8655908 commit c5ab5e5

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

object-name.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ static int extend_abbrev_len(const struct object_id *oid, void *cb_data)
704704
while (mad->hex[i] && mad->hex[i] == get_hex_char_from_oid(oid, i))
705705
i++;
706706

707-
if (i < GIT_MAX_RAWSZ && i >= mad->cur_len)
707+
if (mad->hex[i] && i >= mad->cur_len)
708708
mad->cur_len = i + 1;
709709

710710
return 0;

0 commit comments

Comments
 (0)