resolve PR review

metalogical · metalogical · commit fb7b01b40c33 · 2020-06-11T17:05:25.000-07:00
diff --git a/command/pr.go b/command/pr.go
@@ -116,7 +116,7 @@ func prStatus(cmd *cobra.Command, args []string) error {
 	repoOverride, _ := cmd.Flags().GetString("repo")
 	currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx, baseRepo)
 
-	if err != nil && repoOverride == "" && err != git.ErrNotOnAnyBranch {
+	if err != nil && repoOverride == "" && !errors.Is(err, git.ErrNotOnAnyBranch) {
 		return fmt.Errorf("could not query for pull request for current branch: %w", err)
 	}
 
diff --git a/command/pr_test.go b/command/pr_test.go
@@ -299,6 +299,38 @@ Requesting a code review from you
 	}
 }
 
+func TestPRStatus_detachedHead(t *testing.T) {
+	initBlankContext("", "OWNER/REPO", "")
+	http := initFakeHTTP()
+	http.StubRepoResponse("OWNER", "REPO")
+
+	http.StubResponse(200, bytes.NewBufferString(`
+	{ "data": {} }
+	`))
+
+	output, err := RunCommand("pr status")
+	if err != nil {
+		t.Errorf("error running command `pr status`: %v", err)
+	}
+
+	expected := `
+Relevant pull requests in OWNER/REPO
+
+Current branch
+  There is no current branch
+
+Created by you
+  You have no open pull requests
+
+Requesting a code review from you
+  You have no pull requests to review
+
+`
+	if output.String() != expected {
+		t.Errorf("expected %q, got %q", expected, output.String())
+	}
+}
+
 func TestPRList(t *testing.T) {
 	initBlankContext("", "OWNER/REPO", "master")
 	http := initFakeHTTP()
diff --git a/context/blank_context.go b/context/blank_context.go
@@ -18,6 +18,7 @@ func NewBlank() *blankContext {
 type blankContext struct {
 	authToken string
 	branch    string
+	branchErr error
 	baseRepo  ghrepo.Interface
 	remotes   Remotes
 }
@@ -40,7 +41,7 @@ func (c *blankContext) SetAuthToken(t string) {
 
 func (c *blankContext) Branch() (string, error) {
 	if c.branch == "" {
-		return "", fmt.Errorf("branch was not initialized")
+		return "", fmt.Errorf("branch was not initialized: %w", git.ErrNotOnAnyBranch)
 	}
 	return c.branch, nil
 }
diff --git a/context/context.go b/context/context.go
@@ -207,11 +207,7 @@ func (c *fsContext) Branch() (string, error) {
 	}
 
 	currentBranch, err := git.CurrentBranch()
-	switch err {
-	case nil:
-	case git.ErrNotOnAnyBranch:
-		return "", err
-	default:
+	if err != nil {
 		return "", fmt.Errorf("could not determine current branch: %w", err)
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@ func prStatus(cmd *cobra.Command, args []string) error {`
`116`	`116`	`repoOverride, _ := cmd.Flags().GetString("repo")`
`117`	`117`	`currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx, baseRepo)`
`118`	`118`
`119`		`- if err != nil && repoOverride == "" && err != git.ErrNotOnAnyBranch {`
	`119`	`+ if err != nil && repoOverride == "" && !errors.Is(err, git.ErrNotOnAnyBranch) {`
`120`	`120`	`return fmt.Errorf("could not query for pull request for current branch: %w", err)`
`121`	`121`	`}`
`122`	`122`
Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,7 @@ func NewBlank() *blankContext {`
`18`	`18`	`type blankContext struct {`
`19`	`19`	`authToken string`
`20`	`20`	`branch string`
	`21`	`+ branchErr error`
`21`	`22`	`baseRepo ghrepo.Interface`
`22`	`23`	`remotes Remotes`
`23`	`24`	`}`
`@@ -40,7 +41,7 @@ func (c *blankContext) SetAuthToken(t string) {`
`40`	`41`
`41`	`42`	`func (c *blankContext) Branch() (string, error) {`
`42`	`43`	`if c.branch == "" {`
`43`		`- return "", fmt.Errorf("branch was not initialized")`
	`44`	`+ return "", fmt.Errorf("branch was not initialized: %w", git.ErrNotOnAnyBranch)`
`44`	`45`	`}`
`45`	`46`	`return c.branch, nil`
`46`	`47`	`}`
Original file line number	Diff line number	Diff line change
`@@ -207,11 +207,7 @@ func (c *fsContext) Branch() (string, error) {`
`207`	`207`	`}`
`208`	`208`
`209`	`209`	`currentBranch, err := git.CurrentBranch()`
`210`		`- switch err {`
`211`		`- case nil:`
`212`		`- case git.ErrNotOnAnyBranch:`
`213`		`- return "", err`
`214`		`- default:`
	`210`	`+ if err != nil {`
`215`	`211`	`return "", fmt.Errorf("could not determine current branch: %w", err)`
`216`	`212`	`}`
`217`	`213`