cli: force update local plugin index (close hasura#6219) (#70)

hasura-bot · scriptonist · hasura-bot · commit 2f7f2eb32d8c · 2020-11-20T07:59:58.000Z
Co-authored-by: scriptonist <aravindkp@hasura.io> GITHUB_PR_NUMBER: 6231 GITHUB_PR_URL: hasura#6231 Co-authored-by: scriptonist <aravindkp@hasura.io> GitOrigin-RevId: c34d88b
diff --git a/cli/util/git.go b/cli/util/git.go
@@ -107,6 +107,7 @@ func (g *GitUtil) updateAndCleanUntracked() error {
 	}
 	err = wt.Pull(&git.PullOptions{
 		ReferenceName: g.ReferenceName,
+		Force:         true,
 	})
 	if err != nil && err != git.NoErrAlreadyUpToDate {
 		return err

Original file line number	Diff line number	Diff line change
`@@ -107,6 +107,7 @@ func (g *GitUtil) updateAndCleanUntracked() error {`
`107`	`107`	`}`
`108`	`108`	`err = wt.Pull(&git.PullOptions{`
`109`	`109`	`ReferenceName: g.ReferenceName,`
	`110`	`+ Force: true,`
`110`	`111`	`})`
`111`	`112`	`if err != nil && err != git.NoErrAlreadyUpToDate {`
`112`	`113`	`return err`