aboutsummaryrefslogtreecommitdiff
path: root/object-store.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2025-05-19 16:02:47 -0700
committerJunio C Hamano <gitster@pobox.com>2025-05-19 16:02:47 -0700
commita9dcacbf2a74537916f61dd8c5f2dd2c1b4eb58a (patch)
tree1e9684531b97a24571f1f977137fe42b5bab69f7 /object-store.h
parent9af978fa041d69d4281315630e659550a1d8104e (diff)
parent4b63963f5d729cb9eb997c8912b7d500ffc53297 (diff)
downloadgit-a9dcacbf2a74537916f61dd8c5f2dd2c1b4eb58a.tar.xz
Merge branch 'jk/oidmap-cleanup'
Code cleanup. * jk/oidmap-cleanup: raw_object_store: drop extra pointer to replace_map oidmap: add size function oidmap: rename oidmap_free() to oidmap_clear()
Diffstat (limited to 'object-store.h')
-rw-r--r--object-store.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/object-store.h b/object-store.h
index c2fe5a1960..141b801113 100644
--- a/object-store.h
+++ b/object-store.h
@@ -5,6 +5,7 @@
#include "object.h"
#include "list.h"
#include "oidset.h"
+#include "oidmap.h"
#include "thread-utils.h"
struct oidmap;
@@ -109,7 +110,7 @@ struct raw_object_store {
* Objects that should be substituted by other objects
* (see git-replace(1)).
*/
- struct oidmap *replace_map;
+ struct oidmap replace_map;
unsigned replace_map_initialized : 1;
pthread_mutex_t replace_mutex; /* protect object replace functions */