From 72f16bd603ad961908222582125591c42f8131a5 Mon Sep 17 00:00:00 2001 From: Relintai Date: Thu, 9 Apr 2020 15:15:22 +0200 Subject: [PATCH] Add -d command line option to git clean commands. --- SConstruct | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/SConstruct b/SConstruct index 70a6baf7..ac07fbc1 100644 --- a/SConstruct +++ b/SConstruct @@ -109,11 +109,11 @@ def update_repository(data, clone_path, branch = 'master'): subprocess.call('git reset', shell=True) subprocess.call('git reset --hard', shell=True) - subprocess.call('git clean -f', shell=True) + subprocess.call('git clean -f -d', shell=True) subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True) subprocess.call('git reset', shell=True) subprocess.call('git reset --hard', shell=True) - subprocess.call('git clean -f', shell=True) + subprocess.call('git clean -f -d', shell=True) subprocess.call('git pull origin ' + branch, shell=True) process = subprocess.Popen('git rev-parse HEAD', shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT) @@ -140,7 +140,7 @@ def setup_repository(data, clone_path, branch = 'master'): subprocess.call('git reset', shell=True) subprocess.call('git reset --hard', shell=True) - subprocess.call('git clean -f', shell=True) + subprocess.call('git clean -f -d', shell=True) subprocess.call('git checkout -B ' + branch + ' origin/' + branch, shell=True) subprocess.call('git pull origin master', shell=True) @@ -148,7 +148,7 @@ def setup_repository(data, clone_path, branch = 'master'): target = target_commits[data[1]][branch] subprocess.call('git checkout -B ' + branch + ' ' + target, shell=True) - subprocess.call('git clean -f', shell=True) + subprocess.call('git clean -f -d', shell=True) subprocess.call('git reset', shell=True) subprocess.call('git reset --hard', shell=True)