Merge pull request #89 from picostack/staging

Southclaws · web-flow · commit dc7d99f263db · 2020-10-27T12:19:58.000Z
update gitwatch to v1.5.1 (#88)
diff --git a/go.mod b/go.mod
@@ -3,7 +3,7 @@ module github.com/picostack/pico
 go 1.13
 
 require (
-	github.com/Southclaws/gitwatch v1.5.0
+	github.com/Southclaws/gitwatch v1.5.1
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/eapache/go-resiliency v1.2.0
 	github.com/frankban/quicktest v1.4.1 // indirect
diff --git a/go.sum b/go.sum
@@ -15,6 +15,8 @@ github.com/Southclaws/gitwatch v1.4.2 h1:7HrA4sGCV+a1LHxiBf5vOO06CMKb6cYiVaATPoz
 github.com/Southclaws/gitwatch v1.4.2/go.mod h1:xCudUiwWxkDYZ69cEhlTwAKIzbG1OpnA/s/pjPIW6gU=
 github.com/Southclaws/gitwatch v1.5.0 h1:SEafeI+2krvRmSxinXXl3dotb35eJIXSh0b5jpLk+X0=
 github.com/Southclaws/gitwatch v1.5.0/go.mod h1:xCudUiwWxkDYZ69cEhlTwAKIzbG1OpnA/s/pjPIW6gU=
+github.com/Southclaws/gitwatch v1.5.1 h1:2HqCcZqRn/ud/0nKQU77PCallkz8Tvvl9V6uRODHh/U=
+github.com/Southclaws/gitwatch v1.5.1/go.mod h1:xCudUiwWxkDYZ69cEhlTwAKIzbG1OpnA/s/pjPIW6gU=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7 h1:uSoVVbwJiQipAclBbw+8quDsfcvFjOpI5iCf4p/cqCs=
 github.com/alcortesm/tgz v0.0.0-20161220082320-9c5fe88206d7/go.mod h1:6zEj6s6u/ghQa61ZWa/C2Aw3RkjiTBOix7dkqa1VLIs=
 github.com/anmitsu/go-shlex v0.0.0-20161002113705-648efa622239 h1:kFOfPq6dUM1hTo4JG6LR5AXSUEsOjtdm0kw0FtQtMJA=
diff --git a/reconfigurer/git.go b/reconfigurer/git.go
@@ -109,6 +109,7 @@ func (p *GitProvider) watchConfig() (err error) {
 		p.directory,
 		p.authMethod,
 		false)
+	p.configWatcher.UseForce = true
 	if err != nil {
 		return errors.Wrap(err, "failed to watch config target")
 	}
diff --git a/watcher/git.go b/watcher/git.go
@@ -189,6 +189,7 @@ func (w *GitWatcher) watchTargets() (err error) {
 		w.directory,
 		nil,
 		false)
+	w.targetsWatcher.UseForce = true
 	if err != nil {
 		return errors.Wrap(err, "failed to watch targets")
 	}

-Original file line number
+Diff line change
 go 1.13
 require (
 -	github.com/Southclaws/gitwatch v1.5.0
 +	github.com/Southclaws/gitwatch v1.5.1
 	github.com/cpuguy83/go-md2man/v2 v2.0.0 // indirect
 	github.com/eapache/go-resiliency v1.2.0
 	github.com/frankban/quicktest v1.4.1 // indirect
Original file line number	Diff line number	Diff line change
`@@ -109,6 +109,7 @@ func (p *GitProvider) watchConfig() (err error) {`
`109`	`109`	`p.directory,`
`110`	`110`	`p.authMethod,`
`111`	`111`	`false)`
	`112`	`+ p.configWatcher.UseForce = true`
`112`	`113`	`if err != nil {`
`113`	`114`	`return errors.Wrap(err, "failed to watch config target")`
`114`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,7 @@ func (w *GitWatcher) watchTargets() (err error) {`
`189`	`189`	`w.directory,`
`190`	`190`	`nil,`
`191`	`191`	`false)`
	`192`	`+ w.targetsWatcher.UseForce = true`
`192`	`193`	`if err != nil {`
`193`	`194`	`return errors.Wrap(err, "failed to watch targets")`
`194`	`195`	`}`