git clean should also clean directories #3

eclipse-sumo · Nov 13, 2023 · e15c043 · e15c043
1 parent f423307
commit e15c043
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/tools/build_config/dailyBuildMSVC.py b/tools/build_config/dailyBuildMSVC.py
@@ -58,7 +58,7 @@ def repositoryUpdate(options):
     cwd = os.getcwd()
     for d in options.repositories.split(","):
         os.chdir(os.path.join(options.rootDir, d))
-        status.log_subprocess(["git", "clean", "-f", "-x", "-q"])
+        status.log_subprocess(["git", "clean", "-f", "-x", "-d", "-q"])
         status.log_subprocess(["git", "pull"])
         status.log_subprocess(["git", "submodule", "update"])
         if gitrev == "":

diff --git a/tools/build_config/dailyUpdateMakeGCC.sh b/tools/build_config/dailyUpdateMakeGCC.sh
@@ -38,7 +38,7 @@ date >> $STATUSLOG
 echo "--" >> $STATUSLOG
 cd $PREFIX/sumo
 basename $MAKELOG >> $STATUSLOG
-git clean -f -x -q . &> $MAKELOG || (echo "git clean failed" | tee -a $STATUSLOG; tail -10 $MAKELOG)
+git clean -f -x -d -q . &> $MAKELOG || (echo "git clean failed" | tee -a $STATUSLOG; tail -10 $MAKELOG)
 git pull >> $MAKELOG 2>&1 || (echo "git pull failed" | tee -a $STATUSLOG; tail -10 $MAKELOG)
 git submodule update >> $MAKELOG 2>&1 || (echo "git submodule update failed" | tee -a $STATUSLOG; tail -10 $MAKELOG)
 GITREV=`tools/build_config/version.py -`