Page MenuHomePhabricator
Files F13997632

D16988.id40874.diff
No OneTemporary
Actions

D16988.id40874.diff
View Options

diff --git a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
--- a/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
+++ b/src/applications/diffusion/engine/DiffusionCommitHookEngine.php
@@ -610,7 +610,11 @@
self::ENV_REMOTE_ADDRESS => $this->getRemoteAddress(),
);
- $directories = $this->getRepository()->getHookDirectories();
+ $repository = $this->getRepository();
+
+ $env += $repository->getPassthroughEnvironmentalVariables();
+
+ $directories = $repository->getHookDirectories();
foreach ($directories as $directory) {
$hooks = $this->getExecutablesInDirectory($directory);
sort($hooks);
diff --git a/src/applications/diffusion/protocol/DiffusionCommandEngine.php b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
--- a/src/applications/diffusion/protocol/DiffusionCommandEngine.php
+++ b/src/applications/diffusion/protocol/DiffusionCommandEngine.php
@@ -209,6 +209,8 @@
}
}
+ $env += $repository->getPassthroughEnvironmentalVariables();
+
return $env;
}
diff --git a/src/applications/repository/storage/PhabricatorRepository.php b/src/applications/repository/storage/PhabricatorRepository.php
--- a/src/applications/repository/storage/PhabricatorRepository.php
+++ b/src/applications/repository/storage/PhabricatorRepository.php
@@ -2015,6 +2015,57 @@
return $client;
}
+ public function getPassthroughEnvironmentalVariables() {
+ $env = $_ENV;
+
+ if ($this->isGit()) {
+ // $_ENV does not populate in CLI contexts if "E" is missing from
+ // "variables_order" in PHP config. Currently, we do not require this
+ // to be configured. Since it may not be, explictitly bring expected Git
+ // environmental variables into scope. This list is not exhaustive, but
+ // only lists variables with a known impact on commit hook behavior.
+
+ // This can be removed if we later require "E" in "variables_order".
+
+ $git_env = array(
+ 'GIT_OBJECT_DIRECTORY',
+ 'GIT_ALTERNATE_OBJECT_DIRECTORIES',
+ 'GIT_QUARANTINE_PATH',
+ );
+ foreach ($git_env as $key) {
+ $value = getenv($key);
+ if (strlen($value)) {
+ $env[$key] = $value;
+ }
+ }
+
+ $key = 'GIT_PUSH_OPTION_COUNT';
+ $git_count = getenv($key);
+ if (strlen($git_count)) {
+ $git_count = (int)$git_count;
+ $env[$key] = $git_count;
+ for ($ii = 0; $ii < $git_count; $ii++) {
+ $key = 'GIT_PUSH_OPTION_'.$ii;
+ $env[$key] = getenv($key);
+ }
+ }
+ }
+
+ $result = array();
+ foreach ($env as $key => $value) {
+ // In Git, pass anything matching "GIT_*" though. Some of these variables
+ // need to be preserved to allow `git` operations to work properly when
+ // running from commit hooks.
+ if ($this->isGit()) {
+ if (preg_match('/^GIT_/', $key)) {
+ $result[$key] = $value;
+ }
+ }
+ }
+
+ return $result;
+ }
+
/* -( Repository URIs )---------------------------------------------------- */

File Metadata

Mime Type
text/plain
Expires
Fri, Oct 25, 5:26 AM (3 w, 3 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6706761
Default Alt Text
D16988.id40874.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility