Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

pr: do not fetch tags for backport command #1104

Closed
wants to merge 1 commit into from
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
@@ -111,7 +111,7 @@ public void handle(PullRequestBot bot, HostedCommit commit, CensusInstance censu
var localRepo = bot.hostedRepositoryPool()
.orElseThrow(() -> new IllegalStateException("Missing repository pool for PR bot"))
.materialize(fork, localRepoDir);
var fetchHead = localRepo.fetch(bot.repo().url(), hash.hex());
var fetchHead = localRepo.fetch(bot.repo().url(), hash.hex(), false);
localRepo.checkout(targetBranch);
var head = localRepo.head();
var backportBranch = localRepo.branch(head, "backport-" + hash.abbreviate());
@@ -135,7 +135,7 @@ public void handle(PullRequestBot bot, HostedCommit commit, CensusInstance censu
lines.add("");
lines.add("```");
lines.add("$ git checkout -b " + backportBranch.name());
lines.add("$ git fetch " + bot.repo().webUrl() + " " + hash.hex());
lines.add("$ git fetch --no-tags " + bot.repo().webUrl() + " " + hash.hex());
lines.add("$ git cherry-pick --no-commit " + hash.hex());
lines.add("$ # Resolve conflicts");
lines.add("$ git add files/with/resolved/conflicts");