Skip to content

updated: use configured remote instead of hardcoded origin #37720

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
sshane wants to merge 1 commit into
base: master
Choose a base branch
from
+12 −4
Open

updated: use configured remote instead of hardcoded origin #37720

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions system/updated/updated.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -265,6 +265,13 @@ def update_available(self) -> bool:
return hash_mismatch or branch_mismatch
return False

def get_remote(self, path: str) -> str:
branch = self.get_branch(path)
try:
return run(["git", "config", f"branch.{branch}.remote"], path).rstrip()
except subprocess.CalledProcessError:
return "origin"

def get_branch(self, path: str) -> str:
return run(["git", "rev-parse", "--abbrev-ref", "HEAD"], path).rstrip()

Expand Down Expand Up @@ -347,7 +354,7 @@ def check_for_update(self) -> None:
excluded_branches = ('release2', 'release2-staging')

try:
run(["git", "ls-remote", "origin", "HEAD"], OVERLAY_MERGED)
run(["git", "ls-remote", self.get_remote(OVERLAY_MERGED), "HEAD"], OVERLAY_MERGED)
self._has_internet = True
except subprocess.CalledProcessError:
self._has_internet = False
Expand Down Expand Up @@ -382,16 +389,17 @@ def fetch_update(self) -> None:

setup_git_options(OVERLAY_MERGED)

run(["git", "config", "--replace-all", "remote.origin.fetch", "+refs/heads/*:refs/remotes/origin/*"], OVERLAY_MERGED)
remote = self.get_remote(OVERLAY_MERGED)
run(["git", "config", "--replace-all", f"remote.{remote}.fetch", f"+refs/heads/*:refs/remotes/{remote}/*"], OVERLAY_MERGED)

branch = self.target_branch
git_fetch_output = run(["git", "fetch", "origin", branch], OVERLAY_MERGED)
git_fetch_output = run(["git", "fetch", remote, branch], OVERLAY_MERGED)
cloudlog.info("git fetch success: %s", git_fetch_output)

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", "branch", "--set-upstream-to", f"{remote}/{branch}"],
["git", "reset", "--hard"],
["git", "clean", "-xdff"],
["git", "submodule", "sync"],
Expand Down
Loading