admin/git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

replace-object: allow do_lookup_replace_object to handle arbitrary repositories

Browse Source 
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
Stefan Beller
2018-04-11 17:21:17 -07:00
committed by Junio C Hamano
parent 5982da9d2c
commit 5643557e63
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
replace_object.c
View File

@@ -53,17 +53,18 @@ static void prepare_replace_object(struct repository *r)
* permanently-allocated value. This function always respects replace
* references, regardless of the value of check_replace_refs.
*/
const struct object_id *do_lookup_replace_object_the_repository(const struct object_id *oid)
const struct object_id *do_lookup_replace_object(struct repository *r,
const struct object_id *oid)
{
int depth = MAXREPLACEDEPTH;
const struct object_id *cur = oid;
prepare_replace_object(the_repository);
prepare_replace_object(r);
/* Try to recursively replace the object */
while (depth-- > 0) {
struct replace_object *repl_obj =
oidmap_get(the_repository->objects->replace_map, cur);
oidmap_get(r->objects->replace_map, cur);
if (!repl_obj)
return cur;
cur = &repl_obj->replacement;