Commit 2fbb4b0545760de4511062ce9ea5478092b955b1
Exists in
spb-stable
and in
2 other branches
Merge branch 'clean-satellite' into 'master'
Clean working directory in satellite
Showing
1 changed file
with
1 additions
and
0 deletions
Show diff stats
lib/gitlab/satellite/satellite.rb
| @@ -84,6 +84,7 @@ module Gitlab | @@ -84,6 +84,7 @@ module Gitlab | ||
| 84 | # Clear the working directory | 84 | # Clear the working directory |
| 85 | def clear_working_dir! | 85 | def clear_working_dir! |
| 86 | repo.git.reset(hard: true) | 86 | repo.git.reset(hard: true) |
| 87 | + repo.git.clean(f: true, d: true, x: true) | ||
| 87 | end | 88 | end |
| 88 | 89 | ||
| 89 | # Deletes all branches except the parking branch | 90 | # Deletes all branches except the parking branch |