updated: clean untracked nested git repos (#25917)

* updated: clean untracked nested git repos

* ff all the cleans

release/build_devel.sh

@@ -32,7 +32,7 @@ git checkout -f --track origin/master-ci
 git reset --hard master-ci
 git checkout master-ci
 git reset --hard origin/devel
-git clean -xdf
+git clean -xdff
 git lfs uninstall
 
 # remove everything except .git
@@ -41,7 +41,7 @@ find . -maxdepth 1 -not -path './.git' -not -name '.' -not -name '..' -exec rm -
 
 # reset source tree
 cd $SOURCE_DIR
-git clean -xdf
+git clean -xdff
 
 # do the files copy
 echo "[-] copying files T=$SECONDS"

scripts/switch_to_master.sh

@@ -1,16 +0,0 @@
-#!/usr/bin/bash
-
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
-cd $DIR/..
-
-git clean -xdf .
-git rm -r --cached .
-
-git config remote.origin.fetch "+refs/heads/*:refs/remotes/origin/*"
-git fetch origin master
-git checkout master
-git reset --hard
-git submodule update --init
-
-printf '\n\n'
-echo "master checked out. reboot to start building openpilot master"

selfdrive/test/setup_device_ci.sh

@@ -59,9 +59,9 @@ git fetch --verbose origin $GIT_COMMIT
 find . -maxdepth 1 -not -path './.git' -not -name '.' -not -name '..' -exec rm -rf '{}' \;
 git reset --hard $GIT_COMMIT
 git checkout $GIT_COMMIT
-git clean -xdf
+git clean -xdff
 git submodule update --init --recursive
-git submodule foreach --recursive "git reset --hard && git clean -xdf"
+git submodule foreach --recursive "git reset --hard && git clean -xdff"
 
 git lfs pull
 (ulimit -n 65535 && git lfs prune)

selfdrive/updated.py

@@ -377,7 +377,7 @@ class Updater:
       ["git", "checkout", "--force", "--no-recurse-submodules", "-B", branch, "FETCH_HEAD"],
       ["git", "branch", "--set-upstream-to", f"origin/{branch}"],
       ["git", "reset", "--hard"],
-      ["git", "clean", "-xdf"],
+      ["git", "clean", "-xdff"],
       ["git", "submodule", "init"],
       ["git", "submodule", "update"],
     ]