From e29988ab7b5aad52f8e0c1903cca6ecabd9ed143 Mon Sep 17 00:00:00 2001 From: Cameron Clough Date: Tue, 20 Sep 2022 16:41:20 -0700 Subject: [PATCH] updater: enable branch switching with installer gitconfig (#25854) --- selfdrive/updated.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/selfdrive/updated.py b/selfdrive/updated.py index fc51ae799d..c806e726c6 100755 --- 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"],