Reverse order of issue lookup checks

This commit is contained in:
Sam Coe 2020-12-08 14:16:40 -05:00
parent bec5e0cd77
commit b2edf782cf
No known key found for this signature in database
GPG key ID: 8E322C20F811D086

View file

@ -14,14 +14,6 @@ import (
func IssueFromArg(apiClient *api.Client, baseRepoFn func() (ghrepo.Interface, error), arg string) (*api.Issue, ghrepo.Interface, error) {
issueNumber, baseRepo := issueMetadataFromURL(arg)
if baseRepo == nil {
var err error
baseRepo, err = baseRepoFn()
if err != nil {
return nil, nil, fmt.Errorf("could not determine base repo: %w", err)
}
}
if issueNumber == 0 {
var err error
issueNumber, err = strconv.Atoi(strings.TrimPrefix(arg, "#"))
@ -30,6 +22,14 @@ func IssueFromArg(apiClient *api.Client, baseRepoFn func() (ghrepo.Interface, er
}
}
if baseRepo == nil {
var err error
baseRepo, err = baseRepoFn()
if err != nil {
return nil, nil, fmt.Errorf("could not determine base repo: %w", err)
}
}
issue, err := issueFromNumber(apiClient, baseRepo, issueNumber)
return issue, baseRepo, err
}