From 0518a6b0c16c1bce210bc9b2626104ef05975ee1 Mon Sep 17 00:00:00 2001
From: Pavel Salamon <pav.salamon@gmail.com>
Date: Thu, 12 Jan 2023 16:39:07 +0100
Subject: Change config pull.rebase=preserve to pull.rebase=merges

The native git option to preserve merge commits during rebase
has been changed from pull.rebase=preserve to pull.rebase=merges.

This changeset in jgit makes the same config change. The old "preserve"
option is no longer recognized and is replaced by new option called
"merges".

This makes jgit's rebase configuration compatible with native git
versions 2.34 and newer where the old "preserve" option has been
removed.

Change-Id: Ic07ff954e258115e76465a1593ef3259f4c418a3
---
 org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java   | 6 +++---
 org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

(limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
index 281ecfd011..83ae0fc9d4 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/PullCommand.java
@@ -137,8 +137,8 @@ public class PullCommand extends TransportCommand<PullCommand, PullResult> {
 	 * <dt>BranchRebaseMode.REBASE</dt>
 	 * <dd>Equivalent to {@code --rebase} on the command line: use rebase
 	 * instead of merge after fetching.</dd>
-	 * <dt>BranchRebaseMode.PRESERVE</dt>
-	 * <dd>Equivalent to {@code --preserve-merges} on the command line: rebase
+	 * <dt>BranchRebaseMode.MERGES</dt>
+	 * <dd>Equivalent to {@code --rebase-merges} on the command line: rebase
 	 * preserving local merge commits.</dd>
 	 * <dt>BranchRebaseMode.INTERACTIVE</dt>
 	 * <dd>Equivalent to {@code --interactive} on the command line: use
@@ -362,7 +362,7 @@ public class PullCommand extends TransportCommand<PullCommand, PullResult> {
 					.setStrategy(strategy)
 					.setContentMergeStrategy(contentStrategy)
 					.setPreserveMerges(
-							pullRebaseMode == BranchRebaseMode.PRESERVE)
+							pullRebaseMode == BranchRebaseMode.MERGES)
 					.call();
 			result = new PullResult(fetchRes, remote, rebaseRes);
 		} else {
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
index 4e0d9d78c3..1e5523f275 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RebaseCommand.java
@@ -151,7 +151,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
 
 	/**
 	 * The folder containing the hashes of (potentially) rewritten commits when
-	 * --preserve-merges is used.
+	 * --rebase-merges is used.
 	 * <p>
 	 * Native git rebase --merge uses a <em>file</em> of that name to record
 	 * commits to copy notes at the end of the whole rebase.
@@ -160,7 +160,7 @@ public class RebaseCommand extends GitCommand<RebaseResult> {
 	private static final String REWRITTEN = "rewritten"; //$NON-NLS-1$
 
 	/**
-	 * File containing the current commit(s) to cherry pick when --preserve-merges
+	 * File containing the current commit(s) to cherry pick when --rebase-merges
 	 * is used.
 	 */
 	private static final String CURRENT_COMMIT = "current-commit"; //$NON-NLS-1$
-- 
cgit v1.2.3