From 51b81682531b01d385fea04cc25ff4aa3a4e8919 Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 13 Dec 2011 18:42:26 -0800 Subject: [PATCH] Fix fatal in commit message parser Summary: See D1195, which fataled this daemon. https://secure.phabricator.com/daemon/log/2966/ Test Plan: Applied this patch to secure.phabricator.com, restarted daemon, it picked up D1203. Reviewers: btrahan, jungejason, mareksapota Reviewed By: btrahan CC: aran, btrahan, mareksapota Differential Revision: 1204 --- .../base/PhabricatorRepositoryCommitMessageParserWorker.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php b/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php index 18dc4d5817..27f36464a2 100644 --- a/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php +++ b/src/applications/repository/worker/commitmessageparser/base/PhabricatorRepositoryCommitMessageParserWorker.php @@ -96,11 +96,9 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker $commit->getPHID()); if ($revision->getStatus() != DifferentialRevisionStatus::COMMITTED) { - $committer = null; $message = null; - if ($commit->getDetail('authorPHID')) { - $committer = $commit->getDetail('authorPHID'); - } else { + $committer = $data->getCommitDetail('authorPHID'); + if (!$committer) { $committer = $revision->getAuthorPHID(); $message = 'Change committed by '.$commit->getAuthorName().'.'; }