Fix up error message

samcoe · samcoe · commit 8d61b96bde75 · 2021-06-14T10:51:51.000-04:00
diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go
@@ -216,7 +216,7 @@ func syncLocalRepo(srcRepo ghrepo.Interface, opts *SyncOptions) error {
 		}
 
 		if !fastForward && !opts.Force {
-			return fmt.Errorf("can't sync .:%s because there are diverging commits, try using `--force`", branch)
+			return fmt.Errorf("can't sync because there are diverging commits, you can use `--force` to overwrite the commits on .:%s", branch)
 		}
 	}
 
@@ -282,9 +282,9 @@ func syncRemoteRepo(client *api.Client, destRepo, srcRepo ghrepo.Interface, opts
 	err = syncFork(client, destRepo, opts.Branch, commit.Object.SHA, opts.Force)
 	var httpErr api.HTTPError
 	if err != nil && errors.As(err, &httpErr) && notFastForwardErrorMessage.MatchString(httpErr.Message) {
-		return fmt.Errorf("can't sync %s:%s because there are diverging commits, try using `--force`",
-			ghrepo.FullName(destRepo),
-			opts.Branch)
+		destStr := fmt.Sprintf("%s:%s", ghrepo.FullName(destRepo), opts.Branch)
+		return fmt.Errorf("can't sync because there are diverging commits, you can use `--force` to overwrite the commits on %s",
+			destStr)
 	}
 
 	return err

Original file line number	Diff line number	Diff line change
`@@ -216,7 +216,7 @@ func syncLocalRepo(srcRepo ghrepo.Interface, opts *SyncOptions) error {`
`216`	`216`	`}`
`217`	`217`
`218`	`218`	`if !fastForward && !opts.Force {`
`219`		- return fmt.Errorf("can't sync .:%s because there are diverging commits, try using `--force`", branch)
	`219`	+ return fmt.Errorf("can't sync because there are diverging commits, you can use `--force` to overwrite the commits on .:%s", branch)
`220`	`220`	`}`
`221`	`221`	`}`
`222`	`222`
`@@ -282,9 +282,9 @@ func syncRemoteRepo(client *api.Client, destRepo, srcRepo ghrepo.Interface, opts`
`282`	`282`	`err = syncFork(client, destRepo, opts.Branch, commit.Object.SHA, opts.Force)`
`283`	`283`	`var httpErr api.HTTPError`
`284`	`284`	`if err != nil && errors.As(err, &httpErr) && notFastForwardErrorMessage.MatchString(httpErr.Message) {`
`285`		- return fmt.Errorf("can't sync %s:%s because there are diverging commits, try using `--force`",
`286`		`- ghrepo.FullName(destRepo),`
`287`		`- opts.Branch)`
	`285`	`+ destStr := fmt.Sprintf("%s:%s", ghrepo.FullName(destRepo), opts.Branch)`
	`286`	+ return fmt.Errorf("can't sync because there are diverging commits, you can use `--force` to overwrite the commits on %s",
	`287`	`+ destStr)`
`288`	`288`	`}`
`289`	`289`
`290`	`290`	`return err`