Copy all branch configuration values when renaming

Previously only certain values were copied over which caused
divergence in behavior between the JGit command and corresponding
CGit command.

Bug: 372051
Change-Id: I72a83215a679a713138da31f5ab838f14388d4bd
Signed-off-by: Chris Aniszczyk <zx@twitter.com>

1 files changed, 37 insertions, 31 deletions

diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
index 99dc785b8a..f5dfa2b111 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
@@ -45,6 +45,7 @@ package org.eclipse.jgit.api;
 
 import java.io.IOException;
 import java.text.MessageFormat;
+import java.util.Arrays;
 
 import org.eclipse.jgit.api.errors.DetachedHeadException;
 import org.eclipse.jgit.api.errors.InvalidRefNameException;
@@ -138,41 +139,46 @@ public class RenameBranchCommand extends GitCommand<Ref> {
 
 			setCallable(false);
 
-			boolean ok = Result.RENAMED == renameResult;
+			if (Result.RENAMED != renameResult)
+				throw new JGitInternalException(MessageFormat.format(JGitText
+						.get().renameBranchUnexpectedResult, renameResult
+						.name()));
 
-			if (ok) {
-				if (fullNewName.startsWith(Constants.R_HEADS)) {
-					// move the upstream configuration over to the new branch
-					String shortOldName = fullOldName
-							.substring(Constants.R_HEADS.length());
-					final StoredConfig repoConfig = repo.getConfig();
-					String oldRemote = repoConfig.getString(
+			if (fullNewName.startsWith(Constants.R_HEADS)) {
+				String shortOldName = fullOldName.substring(Constants.R_HEADS
+						.length());
+				final StoredConfig repoConfig = repo.getConfig();
+				// Copy all configuration values over to the new branch
+				for (String name : repoConfig.getNames(
+						ConfigConstants.CONFIG_BRANCH_SECTION, shortOldName)) {
+					String[] values = repoConfig.getStringList(
 							ConfigConstants.CONFIG_BRANCH_SECTION,
-							shortOldName, ConfigConstants.CONFIG_KEY_REMOTE);
-					if (oldRemote != null) {
-						repoConfig.setString(
-								ConfigConstants.CONFIG_BRANCH_SECTION, newName,
-								ConfigConstants.CONFIG_KEY_REMOTE, oldRemote);
+							shortOldName, name);
+					if (values.length == 0)
+						continue;
+					// Keep any existing values already configured for the
+					// new branch name
+					String[] existing = repoConfig.getStringList(
+							ConfigConstants.CONFIG_BRANCH_SECTION, newName,
+							name);
+					if (existing.length > 0) {
+						String[] newValues = new String[values.length
+								+ existing.length];
+						System.arraycopy(existing, 0, newValues, 0,
+								existing.length);
+						System.arraycopy(values, 0, newValues, existing.length,
+								values.length);
+						values = newValues;
 					}
-					String oldMerge = repoConfig.getString(
-							ConfigConstants.CONFIG_BRANCH_SECTION,
-							shortOldName, ConfigConstants.CONFIG_KEY_MERGE);
-					if (oldMerge != null) {
-						repoConfig.setString(
-								ConfigConstants.CONFIG_BRANCH_SECTION, newName,
-								ConfigConstants.CONFIG_KEY_MERGE, oldMerge);
-					}
-					repoConfig
-							.unsetSection(
-									ConfigConstants.CONFIG_BRANCH_SECTION,
-									shortOldName);
-					repoConfig.save();
-				}
 
-			} else
-				throw new JGitInternalException(MessageFormat.format(JGitText
-						.get().renameBranchUnexpectedResult, renameResult
-						.name()));
+					repoConfig.setStringList(
+							ConfigConstants.CONFIG_BRANCH_SECTION, newName,
+							name, Arrays.asList(values));
+				}
+				repoConfig.unsetSection(ConfigConstants.CONFIG_BRANCH_SECTION,
+						shortOldName);
+				repoConfig.save();
+			}
 
 			Ref resultRef = repo.getRef(newName);
 			if (resultRef == null)