better error reporting + catch for empty repo

vilmibm · vilmibm · commit 121173c3308b · 2020-03-23T15:21:58.000-05:00
diff --git a/command/pr.go b/command/pr.go
@@ -84,7 +84,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.Error() != "git: not on any branch" {
-		return err
+		return fmt.Errorf("could not query for pull request for current branch: %w", err)
 	}
 
 	prPayload, err := api.PullRequests(apiClient, baseRepo, currentPRNumber, currentPRHeadRef, currentUser)
diff --git a/context/context.go b/context/context.go
@@ -184,7 +184,7 @@ func (c *fsContext) Branch() (string, error) {
 
 	currentBranch, err := git.CurrentBranch()
 	if err != nil {
-		return "", err
+		return "", fmt.Errorf("could not determine current branch: %w", err)
 	}
 
 	c.branch = currentBranch
diff --git a/git/git.go b/git/git.go
@@ -21,6 +21,15 @@ func VerifyRef(ref string) bool {
 
 // CurrentBranch reads the checked-out branch for the git repository
 func CurrentBranch() (string, error) {
+	err := utils.PrepareCmd(GitCommand("log")).Run()
+	if err != nil {
+		// this is a hack.
+		errRe := regexp.MustCompile("your current branch '([^']+)' does not have any commits yet")
+		matches := errRe.FindAllStringSubmatch(err.Error(), -1)
+		if len(matches) > 0 && matches[0][1] != "" {
+			return matches[0][1], nil
+		}
+	}
 	// we avoid using `git branch --show-current` for compatibility with git < 2.22
 	branchCmd := exec.Command("git", "rev-parse", "--abbrev-ref", "HEAD")
 	output, err := utils.PrepareCmd(branchCmd).Output()

Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ func prStatus(cmd *cobra.Command, args []string) error {`
`84`	`84`	`repoOverride, _ := cmd.Flags().GetString("repo")`
`85`	`85`	`currentPRNumber, currentPRHeadRef, err := prSelectorForCurrentBranch(ctx, baseRepo)`
`86`	`86`	`if err != nil && repoOverride == "" && err.Error() != "git: not on any branch" {`
`87`		`- return err`
	`87`	`+ return fmt.Errorf("could not query for pull request for current branch: %w", err)`
`88`	`88`	`}`
`89`	`89`
`90`	`90`	`prPayload, err := api.PullRequests(apiClient, baseRepo, currentPRNumber, currentPRHeadRef, currentUser)`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ func (c *fsContext) Branch() (string, error) {`
`184`	`184`
`185`	`185`	`currentBranch, err := git.CurrentBranch()`
`186`	`186`	`if err != nil {`
`187`		`- return "", err`
	`187`	`+ return "", fmt.Errorf("could not determine current branch: %w", err)`
`188`	`188`	`}`
`189`	`189`
`190`	`190`	`c.branch = currentBranch`