revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-25 06:50:55 +01:00
Code Issues Releases Wiki Activity

Fix issue with ref/fixes in commit messages

Browse source 
Summary: Fixes T4600. If there's also a revision, the variable "$message" gets overwritten. groan~

Test Plan: Pushed a commit with "Fixes T123" and a revision, saw it parse on the first try.

Reviewers: btrahan

Reviewed By: btrahan

Subscribers: chrisbolt, aran, epriestley

Maniphest Tasks: T4600

Differential Revision: https://secure.phabricator.com/D8519
This commit is contained in:
epriestley 2014-03-13 17:47:11 -07:00
parent 29436dfe37
commit 1d30354223
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/applications/repository/worker/commitmessageparser/PhabricatorRepositoryCommitMessageParserWorker.php
View file

@ -128,13 +128,13 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker
$actor); $actor);
if ($committer_name && ($committer_name != $author_name)) { if ($committer_name && ($committer_name != $author_name)) {
$message = pht( $revision_update_comment = pht(
'Closed by commit %s (authored by %s, committed by %s).', 'Closed by commit %s (authored by %s, committed by %s).',
$commit_name, $commit_name,
$author_name, $author_name,
$committer_name); $committer_name);
} else { } else {
$message = pht( $revision_update_comment = pht(
'Closed by commit %s (authored by %s).', 'Closed by commit %s (authored by %s).',
$commit_name, $commit_name,
$author_name); $author_name);
@ -170,7 +170,7 @@ abstract class PhabricatorRepositoryCommitMessageParserWorker
->setIgnoreOnNoEffect(true) ->setIgnoreOnNoEffect(true)
->attachComment( ->attachComment(
id(new DifferentialTransactionComment()) id(new DifferentialTransactionComment())
->setContent($message)); ->setContent($revision_update_comment));
$content_source = PhabricatorContentSource::newForSource( $content_source = PhabricatorContentSource::newForSource(
PhabricatorContentSource::SOURCE_DAEMON, PhabricatorContentSource::SOURCE_DAEMON,