diff options
| author | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:09 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-05-23 08:38:09 +0300 |
| commit | a2cec42213c55dd3ff9febb51612e3f1cab37b12 (patch) | |
| tree | 1eb46a50269638c2163b156fd5b475ac6d95d750 /replace-object.c | |
| parent | 67b878eba14de15bac927bdfa39c2b71ab68fa70 (diff) | |
| parent | 2dc417ab1fa87cbab99eaf8a293380fa763dcd2b (diff) | |
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
Diffstat (limited to 'replace-object.c')
| -rw-r--r-- | replace-object.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/replace-object.c b/replace-object.c index 246b98cd4f..801b5c1678 100644 --- a/replace-object.c +++ b/replace-object.c @@ -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); |