Use more idiomatic pattern

samcoe · samcoe · commit 86f16dbaf540 · 2021-08-04T17:00:20.000-07:00
diff --git a/pkg/cmd/repo/sync/sync.go b/pkg/cmd/repo/sync/sync.go
@@ -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
 		}
 	}

Original file line number	Diff line number	Diff line change
`@@ -239,8 +239,7 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt`
`239`	`239`	`git := opts.Git`
`240`	`240`	`branch := opts.Branch`
`241`	`241`
`242`		`- err := git.Fetch([]string{remote, fmt.Sprintf("+refs/heads/%s", branch)})`
`243`		`- if err != nil {`
	`242`	`+ if err := git.Fetch([]string{remote, fmt.Sprintf("+refs/heads/%s", branch)}); err != nil {`
`244`	`243`	`return err`
`245`	`244`	`}`
`246`	`245`
`@@ -270,33 +269,28 @@ func executeLocalRepoSync(srcRepo ghrepo.Interface, remote string, opts *SyncOpt`
`270`	`269`	`}`
`271`	`270`	`if startBranch != branch {`
`272`	`271`	`if hasLocalBranch {`
`273`		`- err = git.Checkout([]string{branch})`
`274`		`- if err != nil {`
	`272`	`+ if err := git.Checkout([]string{branch}); err != nil {`
`275`	`273`	`return err`
`276`	`274`	`}`
`277`	`275`	`} else {`
`278`		`- err = git.Checkout([]string{"--track", fmt.Sprintf("%s/%s", remote, branch)})`
`279`		`- if err != nil {`
	`276`	`+ if err := git.Checkout([]string{"--track", fmt.Sprintf("%s/%s", remote, branch)}); err != nil {`
`280`	`277`	`return err`
`281`	`278`	`}`
`282`	`279`	`}`
`283`	`280`	`}`
`284`	`281`	`if hasLocalBranch {`
`285`	`282`	`if opts.Force {`
`286`		`- err = git.Reset([]string{"--hard", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)})`
`287`		`- if err != nil {`
	`283`	`+ if err := git.Reset([]string{"--hard", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)}); err != nil {`
`288`	`284`	`return err`
`289`	`285`	`}`
`290`	`286`	`} else {`
`291`		`- err = git.Merge([]string{"--ff-only", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)})`
`292`		`- if err != nil {`
	`287`	`+ if err := git.Merge([]string{"--ff-only", fmt.Sprintf("refs/remotes/%s/%s", remote, branch)}); err != nil {`
`293`	`288`	`return err`
`294`	`289`	`}`
`295`	`290`	`}`
`296`	`291`	`}`
`297`	`292`	`if startBranch != branch {`
`298`		`- err = git.Checkout([]string{startBranch})`
`299`		`- if err != nil {`
	`293`	`+ if err := git.Checkout([]string{startBranch}); err != nil {`
`300`	`294`	`return err`
`301`	`295`	`}`
`302`	`296`	`}`