Merge branch 'sb/object-store-replace'
authorJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:21 +0000 (15:59 +0900)
committerJunio C Hamano <gitster@pobox.com>
Tue, 8 May 2018 06:59:21 +0000 (15:59 +0900)
The effort to pass the repository in-core structure throughout the
API continues.  This round deals with the code that implements the
refs/replace/ mechanism.

* sb/object-store-replace:
  replace-object: allow lookup_replace_object to handle arbitrary repositories
  replace-object: allow do_lookup_replace_object to handle arbitrary repositories
  replace-object: allow prepare_replace_object to handle arbitrary repositories
  refs: allow for_each_replace_ref to handle arbitrary repositories
  refs: store the main ref store inside the repository struct
  replace-object: add repository argument to lookup_replace_object
  replace-object: add repository argument to do_lookup_replace_object
  replace-object: add repository argument to prepare_replace_object
  refs: add repository argument to for_each_replace_ref
  refs: add repository argument to get_main_ref_store
  replace-object: check_replace_refs is safe in multi repo environment
  replace-object: eliminate replace objects prepared flag
  object-store: move lookup_replace_object to replace-object.h
  replace-object: move replace_map to object store
  replace_object: use oidmap

1  2 
cache.h
environment.c
refs.c
refs.h
refs/files-backend.c
replace-object.c
repository.h
sha1-file.c

diff --cc cache.h
Simple merge
diff --cc environment.c
Simple merge
diff --cc refs.c
--- 1/refs.c
--- 2/refs.c
+++ b/refs.c
@@@ -13,7 -13,7 +13,8 @@@
  #include "tag.h"
  #include "submodule.h"
  #include "worktree.h"
 +#include "argv-array.h"
+ #include "repository.h"
  
  /*
   * List of all available backends
diff --cc refs.h
Simple merge
Simple merge
Simple merge
diff --cc repository.h
Simple merge
diff --cc sha1-file.c
Simple merge