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

In Drydock, don't reset current branch to point at unrelated commit

Browse source 
Summary:
Fixes T10037. When we're building commit `aabbccdd`, we currently do this to check it out:

  git reset --hard aabbccdd

However, this has an undesirable side effect of moving the current branch pointer to point at `aabbccdd`. The current branch pointer may be some totally different branch which `aabbccdd` is not part of, so this is confusing and misleading.

Instead, use `git reset --hard HEAD` to get the primary effect we want (destroying staged changes) and then `git checkout aabbccdd` to checkout the commit in a detached HEAD state.

Test Plan:
  - Ran a build (a commit-focused operation) successfully.
  - Verified working copy was pointed at a detached HEAD afterward:

```
builder@sbuild001:/var/drydock/workingcopy-167/repo/git-test-ii$ git status
HEAD detached at ffc7635
nothing to commit, working directory clean
```

  - Ran a land (a branch-foused operation) successfully.
  - Verified working copy was pointed at a branch afterward:

```
builder@sbuild001:/core/data/drydock/workingcopy-168/repo/git-test$ git status
On branch master
Your branch is up-to-date with 'origin/master'.

nothing to commit, working directory clean
```

Reviewers: chad

Reviewed By: chad

Subscribers: yelirekim

Maniphest Tasks: T10037

Differential Revision: https://secure.phabricator.com/D14850
This commit is contained in:
epriestley 2015-12-22 06:09:38 -08:00
parent 57909a705c
commit 426d648681
1 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -249,11 +249,15 @@ final class DrydockWorkingCopyBlueprintImplementation
$ref = idx($spec, 'ref'); $ref = idx($spec, 'ref');
// Reset things first, in case previous builds left anything staged or
// dirty.
$cmd[] = 'git reset --hard HEAD';
if ($commit !== null) { if ($commit !== null) {
$cmd[] = 'git reset --hard %s'; $cmd[] = 'git checkout %s --';
$arg[] = $commit; $arg[] = $commit;
} else if ($branch !== null) { } else if ($branch !== null) {
$cmd[] = 'git checkout %s'; $cmd[] = 'git checkout %s --';
$arg[] = $branch; $arg[] = $branch;
$cmd[] = 'git reset --hard origin/%s'; $cmd[] = 'git reset --hard origin/%s';
@ -267,13 +271,8 @@ final class DrydockWorkingCopyBlueprintImplementation
$arg[] = $ref_ref; $arg[] = $ref_ref;
$arg[] = $ref_ref; $arg[] = $ref_ref;
$cmd[] = 'git checkout %s'; $cmd[] = 'git checkout %s --';
$arg[] = $ref_ref; $arg[] = $ref_ref;
$cmd[] = 'git reset --hard %s';
$arg[] = $ref_ref;
} else {
$cmd[] = 'git reset --hard HEAD';
} }
$cmd = implode(' && ', $cmd); $cmd = implode(' && ', $cmd);