diff options
author | Stefan Beller <sbeller@google.com> | 2018-04-11 17:21:08 -0700 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-04-12 11:38:56 +0900 |
commit | c3c36d7de2cf09fb05701ed672b26c51a008f5cd (patch) | |
tree | 916724272a8de00b2c5cd69130790cb0b59ade17 /replace_object.c | |
parent | replace-object: eliminate replace objects prepared flag (diff) | |
download | tgif-c3c36d7de2cf09fb05701ed672b26c51a008f5cd.tar.xz |
replace-object: check_replace_refs is safe in multi repo environment
In e1111cef23 (inline lookup_replace_object() calls, 2011-05-15) a shortcut
for checking the object replacement was added by setting check_replace_refs
to 0 once the replacements were evaluated to not exist. This works fine in
with the assumption of only one repository in existence.
The assumption won't hold true any more when we work on multiple instances
of a repository structs (e.g. one struct per submodule), as the first
repository to be inspected may have no replacements and would set the
global variable. Other repositories would then completely omit their
evaluation of replacements.
This reverts back the meaning of the flag `check_replace_refs` of
"Do we need to check with the lookup table?" to "Do we need to read
the replacement definition?", adding the bypassing logic to
lookup_replace_object after the replacement definition was read.
As with the original patch, delay the renaming of the global variable
Signed-off-by: Stefan Beller <sbeller@google.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'replace_object.c')
-rw-r--r-- | replace_object.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/replace_object.c b/replace_object.c index 953fa9cc40..b2405f6027 100644 --- a/replace_object.c +++ b/replace_object.c @@ -41,9 +41,6 @@ static void prepare_replace_object(void) oidmap_init(the_repository->objects->replace_map, 0); for_each_replace_ref(register_replace_ref, NULL); - - if (!the_repository->objects->replace_map->map.tablesize) - check_replace_refs = 0; } /* We allow "recursive" replacement. Only within reason, though */ |