From dc79c499f4c75d92a56fe36d13ac6ef3c1a33949 Mon Sep 17 00:00:00 2001 From: Dmitry Khomutov Date: Wed, 27 Dec 2017 22:38:58 +0700 Subject: [PATCH] Added update committer email after clone for Git builds. --- src/PHPCensor/Model/Build/MercurialBuild.php | 8 +++++--- src/PHPCensor/Model/Build/RemoteGitBuild.php | 14 ++++++++++---- 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/PHPCensor/Model/Build/MercurialBuild.php b/src/PHPCensor/Model/Build/MercurialBuild.php index 17976207..4711fbe3 100644 --- a/src/PHPCensor/Model/Build/MercurialBuild.php +++ b/src/PHPCensor/Model/Build/MercurialBuild.php @@ -7,7 +7,7 @@ use PHPCensor\Builder; /** * Mercurial Build Model - * + * * @author Pavel Gopanenko */ class MercurialBuild extends Build @@ -78,9 +78,11 @@ class MercurialBuild extends Build /** * Handle post-clone tasks (switching branch, etc.) + * * @param Builder $builder - * @param $cloneTo - * @param array $extra + * @param string $cloneTo + * @param array $extra + * * @return bool */ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = null) diff --git a/src/PHPCensor/Model/Build/RemoteGitBuild.php b/src/PHPCensor/Model/Build/RemoteGitBuild.php index 93301100..d1938ec9 100644 --- a/src/PHPCensor/Model/Build/RemoteGitBuild.php +++ b/src/PHPCensor/Model/Build/RemoteGitBuild.php @@ -8,7 +8,7 @@ use Psr\Log\LogLevel; /** * Remote Git Build Model - * + * * @author Dan Cryer */ class RemoteGitBuild extends Build @@ -130,9 +130,11 @@ class RemoteGitBuild extends Build /** * Handle any post-clone tasks, like switching branches. + * * @param Builder $builder - * @param $cloneTo - * @param array $extra + * @param string $cloneTo + * @param array $extra + * * @return bool */ protected function postCloneSetup(Builder $builder, $cloneTo, array $extra = null) @@ -147,7 +149,7 @@ class RemoteGitBuild extends Build } // Always update the commit hash with the actual HEAD hash - if ($builder->executeCommand($chdir . ' && git rev-parse HEAD', $cloneTo)) { + if ($builder->executeCommand($chdir . ' && git rev-parse HEAD', $cloneTo)) { $commitId = trim($builder->getLastOutput()); $this->setCommitId($commitId); @@ -155,6 +157,10 @@ class RemoteGitBuild extends Build if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%s %s', $cloneTo, $commitId)) { $this->setCommitMessage(trim($builder->getLastOutput())); } + + if ($builder->executeCommand($chdir . ' && git log -1 --pretty=format:%%ae %s', $cloneTo, $commitId)) { + $this->setCommitterEmail(trim($builder->getLastOutput())); + } } return $success;