Merge branch 'clean-satellite' into 'master'

Clean working directory in satellite

Merge branch 'clean-satellite' into 'master'
Clean working directory in satellite
Dmitriy Zaporozhets
2 parents f09a1ef8 cac916d9
Showing 1 changed file with 1 additions and 0 deletions Show diff stats
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
...	...	@@ -84,6 +84,7 @@ module Gitlab
84	84	# Clear the working directory
85	85	def clear_working_dir!
86	86	repo.git.reset(hard: true)
	87	+ repo.git.clean(f: true, d: true, x: true)
87	88	end
88	89
89	90	# Deletes all branches except the parking branch
...	...