updated: configure branch upstream (#25916)

old-commit-hash: 17ed8dd0e9
taco
Adeeb Shihadeh 3 years ago committed by GitHub
parent 52529fb8f6
commit 1bade71c4f
  1. 3
      selfdrive/updated.py

@ -339,7 +339,7 @@ class Updater:
excluded_branches = ('release2', 'release2-staging', 'dashcam', 'dashcam-staging')
setup_git_options(OVERLAY_MERGED)
output = run(["git", "ls-remote", "--heads"], OVERLAY_MERGED)
output = run(["git", "ls-remote", "--heads", "origin"], OVERLAY_MERGED)
self.branches = defaultdict(lambda: None)
for line in output.split('\n'):
@ -375,6 +375,7 @@ class Updater:
cloudlog.info("git reset in progress")
cmds = [
["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", "submodule", "init"],

Loading…
Cancel
Save