Skip to content

Commit 765d6db

Browse files
committed
fix inadvertant return
1 parent 8c67ef9 commit 765d6db

2 files changed

Lines changed: 5 additions & 4 deletions

File tree

errors/errors.go

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,5 @@ import "errors"
44

55
var (
66
UnauthorizedError = errors.New("`repo-token` lacks required permissions")
7+
NoGitError = errors.New("`git` not installed")
78
)

main.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -184,11 +184,13 @@ func getDiffs(ctx context.Context, config *lcr.Config, prNumber int) ([]*diff.Fi
184184
}
185185

186186
// check that git is installed
187-
_, gitCmdErr := exec.Command("git", "-v").CombinedOutput()
187+
if _, gitCmdErr := exec.Command("git", "-v").CombinedOutput(); gitCmdErr != nil {
188+
return nil, e.NoGitError
189+
}
188190

189191
// For very large diffs, the github api will return a 406, when this
190192
// happens, fallback to calling `git diff` directly
191-
if resp != nil && resp.StatusCode == http.StatusNotAcceptable && gitCmdErr == nil {
193+
if resp != nil && resp.StatusCode == http.StatusNotAcceptable {
192194
gha.Debug("Diff too large, fallback to traditional git command")
193195
pr, _, err := client.PullRequests.Get(ctx, owner, repo, prNumber)
194196
if err != nil {
@@ -208,8 +210,6 @@ func getDiffs(ctx context.Context, config *lcr.Config, prNumber int) ([]*diff.Fi
208210
return nil, fmt.Errorf("failed to run git diff: %w", err)
209211
}
210212
}
211-
212-
return nil, err
213213
}
214214

215215
multi, err := diff.ParseMultiFileDiff(rawDiff)

0 commit comments

Comments
 (0)