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

Fix lint

Browse source
This commit is contained in:
Sam Coe 2021-07-01 09:55:13 -07:00
parent a1e1842e6d
commit 63f7372b31
No known key found for this signature in database
GPG key ID: 8E322C20F811D086
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
pkg/cmd/repo/sync/git.go
View file

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

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

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