From 29aa0ae38142aba6e2c50437925598e9d06d919a Mon Sep 17 00:00:00 2001 From: Azareal Date: Wed, 4 Apr 2018 08:49:54 +0100 Subject: [PATCH] Let's try this... --- updater/main.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/updater/main.go b/updater/main.go index 05fe063f..44f2fece 100644 --- a/updater/main.go +++ b/updater/main.go @@ -60,8 +60,12 @@ func updater(scanner *bufio.Scanner) bool { return logError(err) } - err = workTree.Pull(&git.PullOptions{RemoteName: "origin"}) - if err != nil { + //err = workTree.Pull(&git.PullOptions{RemoteName: "origin"}) + err = workTree.Pull(&git.PullOptions{Force: true}) + if err == git.NoErrAlreadyUpToDate { + fmt.Println("You are already up-to-date") + return true + } else if err != nil { return logError(err) }