diff options
| author | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-05 13:43:12 +0000 |
|---|---|---|
| committer | Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com> | 2014-05-05 13:43:12 +0000 |
| commit | 2fbb4b0545760de4511062ce9ea5478092b955b1 (patch) | |
| tree | 1dff2ebe698caab5a12b116ab398982f33d8ec6c | |
| parent | f09a1ef81d787962e160af7e56d08bc23af52dd1 (diff) | |
| parent | cac916d974cf12083002d01488dfd3ca8ac2a89a (diff) | |
| download | gitlab-ce-2fbb4b0545760de4511062ce9ea5478092b955b1.tar.gz | |
Merge branch 'clean-satellite' into 'master'
Clean working directory in satellite
| -rw-r--r-- | lib/gitlab/satellite/satellite.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/lib/gitlab/satellite/satellite.rb b/lib/gitlab/satellite/satellite.rb index c6e4d3351cf..05123ad9c41 100644 --- a/lib/gitlab/satellite/satellite.rb +++ b/lib/gitlab/satellite/satellite.rb @@ -84,6 +84,7 @@ module Gitlab # Clear the working directory def clear_working_dir! repo.git.reset(hard: true) + repo.git.clean(f: true, d: true, x: true) end # Deletes all branches except the parking branch |