From 66a69bdec5dfc0a2a3d2522f4252904e20672870 Mon Sep 17 00:00:00 2001
From: bchadwic <bchadwick@mail.greenriver.edu>
Date: Tue, 5 Apr 2022 21:35:38 -0700
Subject: [PATCH] fixing lint and formatting

---
 context/context.go                   | 13 +++++++------
 git/fixtures/simple.git/config       |  4 ++--
 pkg/cmd/repo/default/default_test.go |  2 +-
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/context/context.go b/context/context.go
index f596d8810..d2006f97b 100644
--- a/context/context.go
+++ b/context/context.go
@@ -77,8 +77,7 @@ func GetBaseRepo(remotes Remotes) (ghrepo.Interface, error) {
 func (r *ResolvedRemotes) SetBaseRepo(io *iostreams.IOStreams) error {
 	resolution := "base"
 	if !io.CanPrompt() {
-		git.SetRemoteResolution(r.remotes[0].Name, resolution)
-		return nil
+		return git.SetRemoteResolution(r.remotes[0].Name, resolution)
 	}
 
 	// from here on, consult the API
@@ -110,8 +109,7 @@ func (r *ResolvedRemotes) SetBaseRepo(io *iostreams.IOStreams) error {
 	}
 
 	if len(repoNames) == 0 {
-		git.SetRemoteResolution(r.remotes[0].Name, resolution)
-		return nil
+		return git.SetRemoteResolution(r.remotes[0].Name, resolution)
 	}
 
 	baseName := repoNames[0]
@@ -137,12 +135,15 @@ func (r *ResolvedRemotes) SetBaseRepo(io *iostreams.IOStreams) error {
 	return git.SetRemoteResolution(remote.Name, resolution)
 }
 
-func RemoveBaseRepo(remotes Remotes) {
+func RemoveBaseRepo(remotes Remotes) error {
 	for _, remote := range remotes {
 		if remote.Resolved == "base" {
-			git.UnsetRemoteResolution(remote.Remote.Name)
+			if err := git.UnsetRemoteResolution(remote.Remote.Name); err != nil {
+				return err
+			}
 		}
 	}
+	return nil
 }
 
 func (r *ResolvedRemotes) BaseRepo(io *iostreams.IOStreams) (ghrepo.Interface, error) {
diff --git a/git/fixtures/simple.git/config b/git/fixtures/simple.git/config
index 54c13e66c..51cb0d228 100644
--- a/git/fixtures/simple.git/config
+++ b/git/fixtures/simple.git/config
@@ -9,7 +9,7 @@
 	email = monalisa@github.com
 [remote "origin"]
 	url = git@github.com:monathecat/cli.git
-    fetch = +refs/heads/*:refs/remotes/origin/*
+	fetch = +refs/heads/*:refs/remotes/origin/*
 [remote "upstream"]
 	url = git@github.com:cli/cli.git
-    fetch = +refs/heads/trunk:refs/remotes/upstream/trunk
+	fetch = +refs/heads/trunk:refs/remotes/upstream/trunk
diff --git a/pkg/cmd/repo/default/default_test.go b/pkg/cmd/repo/default/default_test.go
index fa32255f6..f4fa9bdbc 100644
--- a/pkg/cmd/repo/default/default_test.go
+++ b/pkg/cmd/repo/default/default_test.go
@@ -121,7 +121,7 @@ func setGitDir(t *testing.T, dir string) {
 	old_GIT_DIR := os.Getenv("GIT_DIR")
 	os.Setenv("GIT_DIR", dir)
 	t.Cleanup(func() {
-		git.UnsetRemoteResolution("upstream")
+		_ = git.UnsetRemoteResolution("upstream") 
 		os.Setenv("GIT_DIR", old_GIT_DIR)
 	})
 }