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

Don't show "master (branched from master)" in UI

Browse source 
Summary:
Ref T3462. If someone works directly on `master`, we currently show "Branch: master (branched from master)" in the UI.

Although this is sort of technically accurate, it is confusing.

Instead, just show "Branch: master" in this situation.

Test Plan: Saw "master" instead of "master (branched from master)".

Reviewers: chad

Reviewed By: chad

Maniphest Tasks: T3462

Differential Revision: https://secure.phabricator.com/D14829
This commit is contained in:
epriestley 2015-12-19 12:55:35 -08:00
parent dbb84f1ddc
commit 8a81d208c4
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/applications/differential/customfield/DifferentialBranchField.php
View file

@ -45,7 +45,7 @@ final class DifferentialBranchField
return pht('%s (bookmark)', $bookmark); return pht('%s (bookmark)', $bookmark);
} else if (strlen($branch)) { } else if (strlen($branch)) {
$onto = $diff->loadTargetBranch(); $onto = $diff->loadTargetBranch();
if (strlen($onto)) { if (strlen($onto) && ($onto !== $branch)) {
return pht( return pht(
'%s (branched from %s)', '%s (branched from %s)',
$branch, $branch,