Skip to content

Commit 099d715

Browse files
committed
merge-bot: use correct credentials for listing PRs
Reviewed-by: rwestberg
1 parent c3359ef commit 099d715

File tree

1 file changed

+5
-5
lines changed
  • bots/merge/src/main/java/org/openjdk/skara/bots/merge

1 file changed

+5
-5
lines changed

bots/merge/src/main/java/org/openjdk/skara/bots/merge/MergeBot.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,11 @@ public void run(Path scratchPath) {
251251
// Must fetch once to update refs/heads
252252
repo.fetchAll();
253253

254-
var prs = target.pullRequests();
255-
var currentUser = target.forge().currentUser();
254+
var prTarget = fork.forge().repository(target.name()).orElseThrow(() ->
255+
new IllegalStateException("Can't get well-known repository " + target.name())
256+
);
257+
var prs = prTarget.pullRequests();
258+
var currentUser = prTarget.forge().currentUser();
256259

257260
for (var spec : specs) {
258261
var toBranch = spec.toBranch();
@@ -441,9 +444,6 @@ public void run(Path scratchPath) {
441444
message.add("");
442445
message.add("This pull request will be closed automatically by a bot once " +
443446
"the merge conflicts have been resolved.");
444-
var prTarget = fork.forge().repository(target.name()).orElseThrow(() ->
445-
new IllegalStateException("Can't get well-known repository " + target.name())
446-
);
447447
fork.createPullRequest(prTarget,
448448
toBranch.name(),
449449
branchDesc,

0 commit comments

Comments
 (0)