@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
Reset Drydock git working copies better
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
+4
-1
+4
-1
src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
+4
-1
src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
···
213
213
$cmd[] = 'git reset --hard %s';
214
214
$arg[] = $commit;
215
215
} else if ($branch !== null) {
216
-
$cmd[] = 'git reset --hard %s';
216
+
$cmd[] = 'git checkout %s';
217
+
$arg[] = $branch;
218
+
219
+
$cmd[] = 'git reset --hard origin/%s';
217
220
$arg[] = $branch;
218
221
} else {
219
222
$cmd[] = 'git reset --hard HEAD';