From 7aa2e6683c8969b5ff9672f46efe54f1c4e7e959 Mon Sep 17 00:00:00 2001
From: Mark Paluch <mpaluch@vmware.com>
Date: Tue, 22 Mar 2022 09:30:33 +0100
Subject: [PATCH] Polishing.

Remove unused code. Prevent merge-commits during pull.

See #206
---
 .../data/release/git/GitOperations.java       | 34 +------------------
 1 file changed, 1 insertion(+), 33 deletions(-)

diff --git a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
index c2b7a8b..b545f4b 100644
--- a/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
+++ b/release-tools/src/main/java/org/springframework/data/release/git/GitOperations.java
@@ -36,8 +36,6 @@ import java.util.stream.StreamSupport;
 import org.apache.commons.io.FileUtils;
 import org.eclipse.jgit.api.AddCommand;
 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.CreateBranchCommand.SetupUpstreamMode;
 import org.eclipse.jgit.api.Git;
@@ -811,6 +809,7 @@ public class GitOperations {
 
 					git.pull()//
 							.setRemote("origin")//
+							.setRebase(true) //
 							.setRemoteBranchName(branch.toString())//
 							.call();
 					break;
@@ -899,37 +898,6 @@ public class GitOperations {
 		}), "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}.
 	 *