From 415385b747eeb40a2b01f84a6a9f54c82c3f36f2 Mon Sep 17 00:00:00 2001 From: Toby Harradine Date: Mon, 24 Sep 2018 13:20:30 +1000 Subject: [PATCH] [Downloader] Fix git pull command (#2146) I somehow managed to botch this in #2121 Signed-off-by: Toby Harradine --- redbot/cogs/downloader/repo_manager.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/redbot/cogs/downloader/repo_manager.py b/redbot/cogs/downloader/repo_manager.py index 538d6c395..fa03f641f 100644 --- a/redbot/cogs/downloader/repo_manager.py +++ b/redbot/cogs/downloader/repo_manager.py @@ -24,7 +24,7 @@ class Repo(RepoJSONMixin): GIT_CURRENT_BRANCH = "git -C {path} rev-parse --abbrev-ref HEAD" GIT_LATEST_COMMIT = "git -C {path} rev-parse {branch}" GIT_HARD_RESET = "git -C {path} reset --hard origin/{branch} -q" - GIT_PULL = "git -C {path} --recurse-submodules=yes -q --ff-only" + GIT_PULL = "git -C {path} pull --recurse-submodules -q --ff-only" GIT_DIFF_FILE_STATUS = "git -C {path} diff --no-commit-id --name-status {old_hash} {new_hash}" GIT_LOG = "git -C {path} log --relative-date --reverse {old_hash}.. {relative_file_path}" GIT_DISCOVER_REMOTE_URL = "git -C {path} config --get remote.origin.url"