From c35c23db8d75f0cfbd7538d64fb43dc80bb52e7e Mon Sep 17 00:00:00 2001
From: Tomasz Zarna
Date: Wed, 24 Aug 2011 10:17:32 +0200
Subject: Use JGitText.refAlreadyExists instead of "ref exists"

Change-Id: I113bcf82c6292db5269271f799d09c80acc40bcd
---
 org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties    | 2 +-
 org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java                | 2 +-
 org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java | 2 +-
 org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java | 2 +-
 org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java   | 3 ++-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 480a659c05..de95b89698 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -359,7 +359,7 @@ rawLogMessageDoesNotParseAsLogEntry=Raw log message does not parse as log entry
 readTimedOut=Read timed out
 readingObjectsFromLocalRepositoryFailed=reading objects from local repository failed: {0}
 receivingObjects=Receiving objects
-refAlreadExists=Ref {0} already exists
+refAlreadyExists=Ref {0} already exists
 refNotResolved=Ref {0} can not be resolved
 refUpdateReturnCodeWas=RefUpdate return code was: {0}
 reflogsNotYetSupportedByRevisionParser=reflogs not yet supported by revision parser
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
index 8496c7e5bd..7dbe158ce8 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/JGitText.java
@@ -419,7 +419,7 @@ public class JGitText extends TranslationBundle {
 	/***/ public String readTimedOut;
 	/***/ public String readingObjectsFromLocalRepositoryFailed;
 	/***/ public String receivingObjects;
-	/***/ public String refAlreadExists;
+	/***/ public String refAlreadyExists;
 	/***/ public String refNotResolved;
 	/***/ public String refUpdateReturnCodeWas;
 	/***/ public String reflogsNotYetSupportedByRevisionParser;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
index ece16489f5..a07fdfc66d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java
@@ -130,7 +130,7 @@ public class CreateBranchCommand extends GitCommand<Ref> {
 					&& refToCheck.getName().startsWith(Constants.R_HEADS);
 			if (!force && exists)
 				throw new RefAlreadyExistsException(MessageFormat.format(
-						JGitText.get().refAlreadExists, name));
+						JGitText.get().refAlreadyExists, name));
 
 			ObjectId startAt = getStartPoint();
 			String startPointFullName = null;
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 04b7791d66..6a1cabf391 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java
@@ -106,7 +106,7 @@ public class RenameBranchCommand extends GitCommand<Ref> {
 			String fullNewName;
 			if (repo.getRef(newName) != null)
 				throw new RefAlreadyExistsException(MessageFormat.format(
-						JGitText.get().refAlreadExists, newName));
+						JGitText.get().refAlreadyExists, newName));
 			if (oldName != null) {
 				Ref ref = repo.getRef(oldName);
 				if (ref == null)
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
index 40435b8a29..c6fe4d18c1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/ReceivePack.java
@@ -947,7 +947,8 @@ public class ReceivePack {
 					// A well behaved client shouldn't have sent us a
 					// create command for a ref we advertised to it.
 					//
-					cmd.setResult(Result.REJECTED_OTHER_REASON, "ref exists");
+					cmd.setResult(Result.REJECTED_OTHER_REASON, MessageFormat
+							.format(JGitText.get().refAlreadyExists, ref));
 					continue;
 				}
 			}
-- 
cgit v1.2.3