CopyBot/Red-DiscordBot
1
0
Fork 0
mirror of https://github.com/Cog-Creators/Red-DiscordBot.git synced 2025-11-06 19:28:54 -05:00
Code Issues Packages Projects Releases Wiki Activity

[Downloader] Fast-forward only on git pull

Browse Source
This commit is contained in:
Twentysix 2017-01-14 14:48:59 +01:00
parent 438d9f5f60
commit 7e96e5ad69
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cogs/downloader.py
View File

@ -569,7 +569,7 @@ class Downloader:
if p.returncode != 0: if p.returncode != 0:
raise UpdateError("Unable to determine old commit hash") raise UpdateError("Unable to determine old commit hash")
oldhash = p.stdout.decode().strip() oldhash = p.stdout.decode().strip()
p = run(["git", "-C", dd + name, "pull", "-q"]) p = run(["git", "-C", dd + name, "pull", "-q", "--ff-only"])
if p.returncode != 0: if p.returncode != 0:
raise UpdateError("Error pulling updates") raise UpdateError("Error pulling updates")
p = run(rpcmd, stdout=PIPE) p = run(rpcmd, stdout=PIPE)