diff options
author | Neeraj Singh <neerajsi@microsoft.com> | 2021-12-06 22:05:05 (GMT) |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2021-12-08 22:06:46 (GMT) |
commit | ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7 (patch) | |
tree | c9e99733796f9a1004ddf6997075423716a4b202 /environment.c | |
parent | b3cecf49eac00d62e361bf6e6e81392f5a2fb571 (diff) | |
download | git-ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7.zip git-ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7.tar.gz git-ecd81dfc79cf12cc21fc0340da8ca8fcc5aa58a7.tar.bz2 |
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 'environment.c')
-rw-r--r-- | environment.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/environment.c b/environment.c index e3a285a..d797f17 100644 --- a/environment.c +++ b/environment.c @@ -177,6 +177,10 @@ void setup_git_env(const char *git_dir) args.graft_file = getenv_safe(&to_free, GRAFT_ENVIRONMENT); args.index_file = getenv_safe(&to_free, INDEX_ENVIRONMENT); args.alternate_db = getenv_safe(&to_free, ALTERNATE_DB_ENVIRONMENT); + if (getenv(GIT_QUARANTINE_ENVIRONMENT)) { + args.disable_ref_updates = 1; + } + repo_set_gitdir(the_repository, git_dir, &args); strvec_clear(&to_free); |