Skip to content

Commit 8c67ef9

Browse files
committed
fix naming collision
1 parent 2e0cb83 commit 8c67ef9

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

main.go

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -172,11 +172,11 @@ func getDiffs(ctx context.Context, config *lcr.Config, prNumber int) ([]*diff.Fi
172172
owner = config.Owner
173173
repo = config.Repo
174174
rawOpts = github.RawOptions{Type: github.Diff}
175-
raw []byte
175+
rawDiff []byte
176176
)
177177

178-
diff, resp, err := client.PullRequests.GetRaw(ctx, owner, repo, prNumber, rawOpts)
179-
raw = []byte(diff)
178+
raw, resp, err := client.PullRequests.GetRaw(ctx, owner, repo, prNumber, rawOpts)
179+
rawDiff = []byte(raw)
180180
if err != nil {
181181
// TODO use this elsewhere
182182
if resp.StatusCode == http.StatusUnauthorized {
@@ -203,7 +203,7 @@ func getDiffs(ctx context.Context, config *lcr.Config, prNumber int) ([]*diff.Fi
203203
}
204204

205205
mergeBaseSha := commitsComparison.GetMergeBaseCommit().GetSHA()
206-
raw, err = exec.Command("git", "diff", "--find-renames", mergeBaseSha, headSha).CombinedOutput()
206+
rawDiff, err = exec.Command("git", "diff", "--find-renames", mergeBaseSha, headSha).CombinedOutput()
207207
if err != nil {
208208
return nil, fmt.Errorf("failed to run git diff: %w", err)
209209
}
@@ -212,7 +212,7 @@ func getDiffs(ctx context.Context, config *lcr.Config, prNumber int) ([]*diff.Fi
212212
return nil, err
213213
}
214214

215-
multi, err := diff.ParseMultiFileDiff(raw)
215+
multi, err := diff.ParseMultiFileDiff(rawDiff)
216216
if err != nil {
217217
return nil, err
218218
}

0 commit comments

Comments
 (0)