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

replace-object: add repository argument to prepare_replace_object

Browse Source 
Add a repository argument to allow the prepare_replace_object caller
to be more specific about which repository to handle. This is a small
mechanical change; it doesn't change the implementation to handle
repositories other than the_repository yet.

As with the previous commits, use a macro to catch callers passing a
repository other than the_repository at compile time.

Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
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:11 -07:00 committed by Junio C Hamano
parent 60ce76d358
commit fe6d34d863
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
replace_object.c
View File

@ -31,7 +31,9 @@ static int register_replace_ref(const char *refname,
return 0; return 0;
} }
static void prepare_replace_object(void) #define prepare_replace_object(r) \
prepare_replace_object_##r()
static void prepare_replace_object_the_repository(void)
{ {
if (the_repository->objects->replace_map) if (the_repository->objects->replace_map)
return; return;
@ -58,7 +60,7 @@ const struct object_id *do_lookup_replace_object(const struct object_id *oid)
int depth = MAXREPLACEDEPTH; int depth = MAXREPLACEDEPTH;
const struct object_id *cur = oid; const struct object_id *cur = oid;
prepare_replace_object(); prepare_replace_object(the_repository);
/* Try to recursively replace the object */ /* Try to recursively replace the object */
while (depth-- > 0) { while (depth-- > 0) {