]> git.ipfire.org Git - thirdparty/git.git/commit - merge-recursive.c
Merge branch 'ew/hashmap'
authorJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:48:01 +0000 (13:48 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 15 Oct 2019 04:48:02 +0000 (13:48 +0900)
commit5efabc7ed9e57bb73159d1ad7739c508167ef24a
tree9e7de3dfe38dcb92614d11613976d32151925ea2
parentd0ce4d9024882b5363141288979ea3689eab9998
parente2b5038d8793a1d1f92b62dab82acc0d6b7dbcb7
Merge branch 'ew/hashmap'

Code clean-up of the hashmap API, both users and implementation.

* ew/hashmap:
  hashmap_entry: remove first member requirement from docs
  hashmap: remove type arg from hashmap_{get,put,remove}_entry
  OFFSETOF_VAR macro to simplify hashmap iterators
  hashmap: introduce hashmap_free_entries
  hashmap: hashmap_{put,remove} return hashmap_entry *
  hashmap: use *_entry APIs for iteration
  hashmap_cmp_fn takes hashmap_entry params
  hashmap_get{,_from_hash} return "struct hashmap_entry *"
  hashmap: use *_entry APIs to wrap container_of
  hashmap_get_next returns "struct hashmap_entry *"
  introduce container_of macro
  hashmap_put takes "struct hashmap_entry *"
  hashmap_remove takes "const struct hashmap_entry *"
  hashmap_get takes "const struct hashmap_entry *"
  hashmap_add takes "struct hashmap_entry *"
  hashmap_get_next takes "const struct hashmap_entry *"
  hashmap_entry_init takes "struct hashmap_entry *"
  packfile: use hashmap_entry in delta_base_cache_entry
  coccicheck: detect hashmap_entry.hash assignment
  diff: use hashmap_entry_init on moved_entry.ent
15 files changed:
attr.c
blame.c
builtin/describe.c
builtin/fast-export.c
builtin/fetch.c
config.c
diff.c
diffcore-rename.c
git-compat-util.h
merge-recursive.c
packfile.c
range-diff.c
ref-filter.c
revision.c
sequencer.c