Merge branch 'sb/object-store-replace'

Hotfix.

* sb/object-store-replace:
  get_main_ref_store: BUG() when outside a repository
  object.c: clear replace map before freeing it
  replace-object.c: remove the_repository from prepare_replace_object
  object.c: free replace map in raw_object_store_clear
This commit is contained in:
Junio C Hamano
2018-05-23 14:38:09 +09:00
3 changed files with 7 additions and 1 deletions

View File

@ -37,7 +37,7 @@ static void prepare_replace_object(struct repository *r)
return;
r->objects->replace_map =
xmalloc(sizeof(*the_repository->objects->replace_map));
xmalloc(sizeof(*r->objects->replace_map));
oidmap_init(r->objects->replace_map, 0);
for_each_replace_ref(r, register_replace_ref, NULL);