From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 8 May 2018 06:59:21 +0000 (+0900)
Subject: Merge branch 'sb/object-store-replace'
X-Git-Tag: v2.18.0-rc0~98
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=174774cd519846616edc475fcbc98237409ffc21;p=thirdparty%2Fgit.git

Merge branch 'sb/object-store-replace'

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
---

174774cd519846616edc475fcbc98237409ffc21
diff --cc refs.c
index 10f69da2b8,9b56fa9b81..64aadd14c9
--- a/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