From bb4a036573659fbfb7b7ff2dc83ef07df99383b9 Mon Sep 17 00:00:00 2001 From: Caleb Johnson Date: Wed, 19 Apr 2017 15:25:12 -0500 Subject: [PATCH] [Downloader] Respect current branch when updating (#675) --- cogs/downloader.py | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cogs/downloader.py b/cogs/downloader.py index 9203f9156..442188e87 100644 --- a/cogs/downloader.py +++ b/cogs/downloader.py @@ -588,11 +588,15 @@ class Downloader: self.populate_list(name) return name, REPO_CLONE, None else: - rpcmd = ["git", "-C", dd + name, "rev-parse", "HEAD"] + rpbcmd = ["git", "-C", dd + name, "rev-parse", "--abbrev-ref", "HEAD"] + p = run(rpbcmd, stdout=PIPE) + branch = p.stdout.decode().strip() + + rpcmd = ["git", "-C", dd + name, "rev-parse", branch] p = run(["git", "-C", dd + name, "reset", "--hard", - "origin/HEAD", "-q"]) + "origin/%s" % branch, "-q"]) if p.returncode != 0: - raise UpdateError("Error resetting to origin/HEAD") + raise UpdateError("Error resetting to origin/%s" % branch) p = run(rpcmd, stdout=PIPE) if p.returncode != 0: raise UpdateError("Unable to determine old commit hash")