Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F14041273
D14194.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
720 B
Referenced Files
None
Subscribers
None
D14194.diff
View Options
diff --git a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
--- a/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
+++ b/src/applications/drydock/blueprint/DrydockWorkingCopyBlueprintImplementation.php
@@ -213,7 +213,10 @@
$cmd[] = 'git reset --hard %s';
$arg[] = $commit;
} else if ($branch !== null) {
- $cmd[] = 'git reset --hard %s';
+ $cmd[] = 'git checkout %s';
+ $arg[] = $branch;
+
+ $cmd[] = 'git reset --hard origin/%s';
$arg[] = $branch;
} else {
$cmd[] = 'git reset --hard HEAD';
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Nov 12, 5:06 PM (6 d, 23 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6737544
Default Alt Text
D14194.diff (720 B)
Attached To
Mode
D14194: Reset Drydock git working copies better
Attached
Detach File
Event Timeline
Log In to Comment