undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

replace-object: allow prepare_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:16 -07:00 committed by Junio C Hamano
parent 0d296c57ae
commit 5982da9d2c
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
replace_object.c
View File

@ -31,18 +31,16 @@ static int register_replace_ref(const char *refname,
return 0;
}
#define prepare_replace_object(r) \
prepare_replace_object_##r()
static void prepare_replace_object_the_repository(void)
static void prepare_replace_object(struct repository *r)
{
if (the_repository->objects->replace_map)
if (r->objects->replace_map)
return;
the_repository->objects->replace_map =
r->objects->replace_map =
xmalloc(sizeof(*the_repository->objects->replace_map));
oidmap_init(the_repository->objects->replace_map, 0);
oidmap_init(r->objects->replace_map, 0);
for_each_replace_ref(the_repository, register_replace_ref, NULL);
for_each_replace_ref(r, register_replace_ref, NULL);
}
/* We allow "recursive" replacement. Only within reason, though */