From 7e96e5ad6983a61df3b66e8f173a4160a9e37fff Mon Sep 17 00:00:00 2001 From: Twentysix Date: Sat, 14 Jan 2017 14:48:59 +0100 Subject: [PATCH] [Downloader] Fast-forward only on git pull --- cogs/downloader.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cogs/downloader.py b/cogs/downloader.py index cdf01ea40..642ae70e0 100644 --- a/cogs/downloader.py +++ b/cogs/downloader.py @@ -569,7 +569,7 @@ class Downloader: if p.returncode != 0: raise UpdateError("Unable to determine old commit hash") 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: raise UpdateError("Error pulling updates") p = run(rpcmd, stdout=PIPE)