updater: enable branch switching with installer gitconfig (#25854)

3 years ago · e29988ab7b
parent bae94a0070
commit e29988ab7b
1 changed files with 2 additions and 2 deletions
--- a/selfdrive/updated.py
+++ b/selfdrive/updated.py
@ -374,8 +374,8 @@ class Updater:

    cloudlog.info("git reset in progress")
    cmds = [
-      ["git", "checkout", "--force", "--no-recurse-submodules", branch],
-      ["git", "reset", "--hard", f"origin/{branch}"],
+      ["git", "checkout", "--force", "--no-recurse-submodules", "-B", branch, "FETCH_HEAD"],
+      ["git", "reset", "--hard"],
      ["git", "clean", "-xdf"],
      ["git", "submodule", "init"],
      ["git", "submodule", "update"],