revi-archive/phorge-arcanist
1
0
Fork 0
mirror of https://we.phorge.it/source/arcanist.git synced 2025-01-10 23:01:04 +01:00
Code Issues Releases Wiki Activity

Make arcanist-created branch names immune to potential git sha1 conflicts

Browse source 
Summary: T854 is hilarious.  seriously, what are the odds?

Test Plan: ran arc patch a few times in a row with the same DX and verified
branches were made with expected, differing names

Reviewers: epriestley, fratrik

CC: aran, epriestley

Maniphest Tasks: T854

Differential Revision: https://secure.phabricator.com/D1605
This commit is contained in:
Bob Trahan 2012-02-13 16:42:24 -08:00
parent e8ca66ead4
commit b24c228b5c
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/workflow/patch/ArcanistPatchWorkflow.php
View file

@ -213,10 +213,9 @@ EOTEXT
$branch_name = null;
$repository_api = $this->getRepositoryAPI();
$revision_id = $bundle->getRevisionID();
$base_name = "arcpatch";
if ($revision_id) {
$base_name = "D{$revision_id}";
} else {
$base_name = "Arcanist-created-branch";
$base_name .= "-D{$revision_id}";
}
$suffixes = array(null, '-1', '-2', '-3');