From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 9 Jul 2019 22:25:43 +0000 (-0700)
Subject: Merge branch 'jk/oidhash'
X-Git-Tag: v2.23.0-rc0~66
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a7db4c193d98f701eda0328dbf69b36f28dd22d3

Merge branch 'jk/oidhash'

Code clean-up to remove hardcoded SHA-1 hash from many places.

* jk/oidhash:
hashmap: convert sha1hash() to oidhash()
hash.h: move object_id definition from cache.h
khash: rename oid helper functions
khash: drop sha1-specific map types
pack-bitmap: convert khash_sha1 maps into kh_oid_map
delta-islands: convert island_marks khash to use oids
khash: rename kh_oid_t to kh_oid_set
khash: drop broken oid_map typedef
object: convert create_object() to use object_id
object: convert internal hash_obj() to object_id
object: convert lookup_object() to use object_id
object: convert lookup_unknown_object() to use object_id
pack-objects: convert locate_object_entry_hash() to object_id
pack-objects: convert packlist_find() to use object_id
pack-bitmap-write: convert some helpers to use object_id
upload-pack: rename a "sha1" variable to "oid"
describe: fix accidental oid/hash type-punning
---

a7db4c193d98f701eda0328dbf69b36f28dd22d3
diff --cc delta-islands.c
index b959f6c380,88d102298c..09dbd3cf72
--- a/delta-islands.c
+++ b/delta-islands.c
@@@ -454,9 -454,9 +454,9 @@@ static void deduplicate_islands(struct 
  	free(list);
  }
  
 -void load_delta_islands(struct repository *r)
 +void load_delta_islands(struct repository *r, int progress)
  {
- 	island_marks = kh_init_sha1();
+ 	island_marks = kh_init_oid_map();
  	remote_islands = kh_init_str();
  
  	git_config(island_config_callback, NULL);