STACKITGit/cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix up error message

Browse source
This commit is contained in:
Sam Coe 2021-06-11 13:34:16 -04:00
parent 8b5abc77ea
commit 8d61b96bde
No known key found for this signature in database
GPG key ID: 8E322C20F811D086
1 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pkg/cmd/repo/sync/sync.go
View file

@ -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