Spring/spring-data-dev-tools
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Polishing.

Browse Source 
Remove unused code. Prevent merge-commits during pull.

See #206
This commit is contained in:
Mark Paluch
2022-03-22 09:30:33 +01:00
parent 73821e7eab
commit 7aa2e6683c
1 changed files with 1 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
View File

@@ -36,8 +36,6 @@ import java.util.stream.StreamSupport;
import org.apache.commons.io.FileUtils; import org.apache.commons.io.FileUtils;
import org.eclipse.jgit.api.AddCommand; import org.eclipse.jgit.api.AddCommand;
import org.eclipse.jgit.api.CheckoutCommand; import org.eclipse.jgit.api.CheckoutCommand;
import org.eclipse.jgit.api.CherryPickResult;
import org.eclipse.jgit.api.CherryPickResult.CherryPickStatus;
import org.eclipse.jgit.api.CommitCommand; import org.eclipse.jgit.api.CommitCommand;
import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode; import org.eclipse.jgit.api.CreateBranchCommand.SetupUpstreamMode;
import org.eclipse.jgit.api.Git; import org.eclipse.jgit.api.Git;
@@ -811,6 +809,7 @@ public class GitOperations {
git.pull()// git.pull()//
.setRemote("origin")// .setRemote("origin")//
.setRebase(true) //
.setRemoteBranchName(branch.toString())// .setRemoteBranchName(branch.toString())//
.call(); .call();
break; break;
@@ -899,37 +898,6 @@ public class GitOperations {
}), "Verify Commit Signing", Optional.empty(), true); }), "Verify Commit Signing", Optional.empty(), true);
} }
private void cherryPickCommitToBranch(ObjectId id, Project project, Branch branch) {
doWithGit(project, git -> {
try {
checkout(project, branch);
} catch (RuntimeException o_O) {
logger.warn(project, "Couldn't check out branch %s. Skipping cherrypick of commit %s.", branch, id.getName());
return;
}
logger.log(project, "git cp %s", id.getName());
// Required as the CherryPick command has no setter for a CredentialsProvide *sigh*
if (gpg.isGpgAvailable()) {
CredentialsProvider.setDefault(new GpgPassphraseProvider(gpg));
}
CherryPickResult result = git.cherryPick().include(id).call();
if (result.getStatus().equals(CherryPickStatus.OK)) {
logger.log(project, "Successfully cherry-picked commit %s to branch %s.", id.getName(), branch);
} else {
logger.warn(project, "Cherry pick failed. aborting…");
logger.log(project, "git reset --hard");
git.reset().setMode(ResetType.HARD).call();
}
});
}
/** /**
* Creates a version branch for the given {@link ModuleIteration}. * Creates a version branch for the given {@link ModuleIteration}.
* *