revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-19 13:22:42 +01:00
Code Issues Releases Wiki Activity

Reset Drydock git working copies better

Browse source 
Summary: Ref T9252. We're currently resetting to the local branch, but should be resetting to the origin branch.

Test Plan: Restarted a build, had it run `git show`, saw proper HEAD.

Reviewers: chad

Reviewed By: chad

Subscribers: hach-que

Maniphest Tasks: T9252

Differential Revision: https://secure.phabricator.com/D14194
This commit is contained in:
epriestley 2015-09-30 07:45:02 -07:00
parent 8f2f841d17
commit 9d997df964
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
View file

@ -213,7 +213,10 @@ final class DrydockWorkingCopyBlueprintImplementation
$cmd[] = 'git reset --hard %s'; $cmd[] = 'git reset --hard %s';
$arg[] = $commit; $arg[] = $commit;
} else if ($branch !== null) { } else if ($branch !== null) {
$cmd[] = 'git reset --hard %s'; $cmd[] = 'git checkout %s';
$arg[] = $branch;
$cmd[] = 'git reset --hard origin/%s';
$arg[] = $branch; $arg[] = $branch;
} else { } else {
$cmd[] = 'git reset --hard HEAD'; $cmd[] = 'git reset --hard HEAD';