From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 10 Jun 2022 22:04:13 +0000 (-0700)
Subject: Merge branch 'ab/env-array'
X-Git-Tag: v2.37.0-rc0~17
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=c21fa3bb549a7769f9d508f0a5f95c654539e1f7;p=thirdparty%2Fgit.git

Merge branch 'ab/env-array'

Rename .env_array member to .env in the child_process structure.

* ab/env-array:
  run-command API users: use "env" not "env_array" in comments & names
  run-command API: rename "env_array" to "env"
---

c21fa3bb549a7769f9d508f0a5f95c654539e1f7
diff --cc builtin/receive-pack.c
index daa153d044,acc512f3a3..e6e1d636f9
--- a/builtin/receive-pack.c
+++ b/builtin/receive-pack.c
@@@ -2214,7 -2214,8 +2214,7 @@@ static const char *unpack(int err_fd, s
  			close(err_fd);
  		return "unable to create temporary object directory";
  	}
- 	strvec_pushv(&child.env_array, tmp_objdir_env(tmp_objdir));
 -	if (tmp_objdir)
 -		strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
++	strvec_pushv(&child.env, tmp_objdir_env(tmp_objdir));
  
  	/*
  	 * Normally we just pass the tmp_objdir environment to the child