summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-04-23 22:07:51 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-04-23 22:07:52 -0700
commit9f1384f711e4d04d7808d4e24860b17f656b7333 (patch)
tree05c3fabffdb57078460b3c89b6df3ae5c473c18f /builtin
parentMerge branch 'jk/loose-object-fsck' (diff)
parentrefs: reject ref updates while GIT_QUARANTINE_PATH is set (diff)
downloadtgif-9f1384f711e4d04d7808d4e24860b17f656b7333.tar.xz
Merge branch 'jk/quarantine-received-objects'
Add finishing touches to a recent topic. * jk/quarantine-received-objects: refs: reject ref updates while GIT_QUARANTINE_PATH is set receive-pack: document user-visible quarantine effects receive-pack: drop tmp_objdir_env from run_update_hook
Diffstat (limited to 'builtin')
-rw-r--r--builtin/receive-pack.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/builtin/receive-pack.c b/builtin/receive-pack.c
index 3cba3fd278..7f484e7f6b 100644
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@ -772,7 +772,6 @@ static int run_update_hook(struct command *cmd)
proc.stdout_to_stderr = 1;
proc.err = use_sideband ? -1 : 0;
proc.argv = argv;
- proc.env = tmp_objdir_env(tmp_objdir);
code = start_command(&proc);
if (code)