]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'ps/odb-generic-object-name-handling'
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2026 22:42:48 +0000 (15:42 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Apr 2026 22:42:49 +0000 (15:42 -0700)
Object name handling (disambiguation and abbreviation) has been
refactored to be backend-generic, moving logic into the respective
object database backends.

* ps/odb-generic-object-name-handling:
  odb: introduce generic `odb_find_abbrev_len()`
  object-file: move logic to compute packed abbreviation length
  object-name: move logic to compute loose abbreviation length
  object-name: simplify computing common prefixes
  object-name: abbreviate loose object names without `disambiguate_state`
  object-name: merge `update_candidates()` and `match_prefix()`
  object-name: backend-generic `get_short_oid()`
  object-name: backend-generic `repo_collect_ambiguous()`
  object-name: extract function to parse object ID prefixes
  object-name: move logic to iterate through packed prefixed objects
  object-name: move logic to iterate through loose prefixed objects
  odb: introduce `struct odb_for_each_object_options`
  oidtree: extend iteration to allow for arbitrary return codes
  oidtree: modernize the code a bit
  object-file: fix sparse 'plain integer as NULL pointer' error

1  2 
builtin/pack-objects.c
object-name.c

Simple merge
diff --cc object-name.c
Simple merge