diff options
| author | Neeraj Singh <neerajsi@microsoft.com> | 2021-12-06 22:05:05 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2021-12-08 14:06:46 -0800 |
| commit | ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7 (patch) | |
| tree | c9e99733796f9a1004ddf6997075423716a4b202 /object-file.c | |
| parent | b3cecf49eac00d62e361bf6e6e81392f5a2fb571 (diff) | |
| download | git-ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7.tar.gz | |
tmp-objdir: disable ref updates when replacing the primary odb
When creating a subprocess with a temporary ODB, we set the
GIT_QUARANTINE_ENVIRONMENT env var to tell child Git processes not
to update refs, since the tmp-objdir may go away.
Introduce a similar mechanism for in-process temporary ODBs when
we call tmp_objdir_replace_primary_odb. Now both mechanisms set
the disable_ref_updates flag on the odb, which is queried by
the ref_transaction_prepare function.
Peff's test case [1] was invoking ref updates via the cachetextconv
setting. That particular code silently does nothing when a ref
update is forbidden. See the call to notes_cache_put in
fill_textconv where errors are ignored.
[1] https://lore.kernel.org/git/YVOn3hDsb5pnxR53@coredump.intra.peff.net/
Reported-by: Jeff King <peff@peff.net>
Signed-off-by: Neeraj Singh <neerajsi@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'object-file.c')
| -rw-r--r-- | object-file.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/object-file.c b/object-file.c index 990381abee..f16441afb9 100644 --- a/object-file.c +++ b/object-file.c @@ -767,6 +767,12 @@ struct object_directory *set_temporary_primary_odb(const char *dir, int will_des */ new_odb = xcalloc(1, sizeof(*new_odb)); new_odb->path = xstrdup(dir); + + /* + * Disable ref updates while a temporary odb is active, since + * the objects in the database may roll back. + */ + new_odb->disable_ref_updates = 1; new_odb->will_destroy = will_destroy; new_odb->next = the_repository->objects->odb; the_repository->objects->odb = new_odb; |