From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Jul 2019 18:30:19 +0000 (-0700)
Subject: Merge branch 'cc/test-oidmap'
X-Git-Tag: v2.23.0-rc0~40
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c62bff2cedead7df6fc55a745f073715da30727e;p=thirdparty%2Fgit.git

Merge branch 'cc/test-oidmap'

Extend the test coverage a bit.

* cc/test-oidmap:
  t0016: add 'remove' subcommand test
  test-oidmap: remove 'add' subcommand
  test-hashmap: remove 'hash' command
  oidmap: use sha1hash() instead of static hash() function
  t: add t0016-oidmap.sh
  t/helper: add test-oidmap.c
---

c62bff2cedead7df6fc55a745f073715da30727e
diff --cc oidmap.c
index b0841a0f58,01c206aaef..6d6e840d03
--- a/oidmap.c
+++ b/oidmap.c
@@@ -36,7 -29,7 +29,7 @@@ void *oidmap_get(const struct oidmap *m
  	if (!map->map.cmpfn)
  		return NULL;
  
- 	return hashmap_get_from_hash(&map->map, hash(key), key);
 -	return hashmap_get_from_hash(&map->map, sha1hash(key->hash), key);
++	return hashmap_get_from_hash(&map->map, oidhash(key), key);
  }
  
  void *oidmap_remove(struct oidmap *map, const struct object_id *key)
@@@ -46,7 -39,7 +39,7 @@@
  	if (!map->map.cmpfn)
  		oidmap_init(map, 0);
  
- 	hashmap_entry_init(&entry, hash(key));
 -	hashmap_entry_init(&entry, sha1hash(key->hash));
++	hashmap_entry_init(&entry, oidhash(key));
  	return hashmap_remove(&map->map, &entry, key);
  }
  
@@@ -57,6 -50,6 +50,6 @@@ void *oidmap_put(struct oidmap *map, vo
  	if (!map->map.cmpfn)
  		oidmap_init(map, 0);
  
- 	hashmap_entry_init(&to_put->internal_entry, hash(&to_put->oid));
 -	hashmap_entry_init(&to_put->internal_entry, sha1hash(to_put->oid.hash));
++	hashmap_entry_init(&to_put->internal_entry, oidhash(&to_put->oid));
  	return hashmap_put(&map->map, to_put);
  }