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

Use more idiomatic pattern

Browse source
This commit is contained in:
Sam Coe 2021-08-04 17:00:20 -07:00
parent c0756c2d1c
commit 86f16dbaf5
No known key found for this signature in database
GPG key ID: 8E322C20F811D086
1 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -239,8 +239,7 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt
git := opts.Git
branch := opts.Branch
err := git.Fetch([]string{remote, fmt.Sprintf("+refs/heads/%s", branch)})
if err != nil {
if err := git.Fetch([]string{remote, fmt.Sprintf("+refs/heads/%s", branch)}); err != nil {
return err
}
@ -270,33 +269,28 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt
}
if startBranch != branch {
if hasLocalBranch {
err = git.Checkout([]string{branch})
if err != nil {
if err := git.Checkout([]string{branch}); err != nil {
return err
}
} else {
err = git.Checkout([]string{"--track", fmt.Sprintf("%s/%s", remote, branch)})
if err != nil {
if err := git.Checkout([]string{"--track", fmt.Sprintf("%s/%s", remote, branch)}); err != nil {
return err
}
}
}
if hasLocalBranch {
if opts.Force {
err = git.Reset([]string{"--hard", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)})
if err != nil {
if err := git.Reset([]string{"--hard", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)}); err != nil {
return err
}
} else {
err = git.Merge([]string{"--ff-only", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)})
if err != nil {
if err := git.Merge([]string{"--ff-only", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)}); err != nil {
return err
}
}
}
if startBranch != branch {
err = git.Checkout([]string{startBranch})
if err != nil {
if err := git.Checkout([]string{startBranch}); err != nil {
return err
}
}