From 63f7372b31a97cb4855de32b8c381f77866bc5bc Mon Sep 17 00:00:00 2001 From: Sam Coe Date: Thu, 1 Jul 2021 09:55:13 -0700 Subject: [PATCH] Fix lint --- pkg/cmd/repo/sync/git.go | 2 +- pkg/cmd/repo/sync/sync.go | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/pkg/cmd/repo/sync/git.go b/pkg/cmd/repo/sync/git.go index 54da42719..fb2a7fd27 100644 --- a/pkg/cmd/repo/sync/git.go +++ b/pkg/cmd/repo/sync/git.go @@ -22,7 +22,7 @@ type gitClient interface { type gitExecuter struct{} func (g *gitExecuter) BranchRemote(branch string) (string, error) { - args := append([]string{"rev-parse", "--symbolic-full-name", "--abbrev-ref", fmt.Sprintf("%s@{u}", branch)}) + args := []string{"rev-parse", "--symbolic-full-name", "--abbrev-ref", fmt.Sprintf("%s@{u}", branch)} cmd, err := git.GitCommand(args...) if err != nil { return "", err diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go index 9178e2a69..b420886fc 100644 --- a/pkg/cmd/repo/sync/sync.go +++ b/pkg/cmd/repo/sync/sync.go @@ -249,6 +249,9 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt hasLocalBranch := git.HasLocalBranch([]string{branch}) if hasLocalBranch { branchRemote, err := git.BranchRemote(branch) + if err != nil { + return err + } if branchRemote != remote { return mismatchRemotesError }