]> granicus.if.org Git - git/commitdiff
Merge branch 'sb/object-store-replace'
authorJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:09 +0000 (14:38 +0900)
committerJunio C Hamano <gitster@pobox.com>
Wed, 23 May 2018 05:38:09 +0000 (14:38 +0900)
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

1  2 
refs.c
replace-object.c

diff --cc refs.c
Simple merge
Simple merge