diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2012-10-25 17:15:02 -0400 |
|---|---|---|
| committer | Gerrit Code Review @ Eclipse.org <gerrit@eclipse.org> | 2012-10-25 17:15:02 -0400 |
| commit | 500becfc634ace18add8b0b499774056a6c55c1b (patch) | |
| tree | 3ad40564fc26c307985a8f2d720737141e086a0e /org.eclipse.jgit/src/org/eclipse/jgit/api | |
| parent | b7d2c9a4465c1f43b142d5693f008604f422410f (diff) | |
| parent | 99e9a3bdc610f91e7dd7a78af3c5c9ce8b01a7a7 (diff) | |
| download | jgit-500becfc634ace18add8b0b499774056a6c55c1b.tar.gz jgit-500becfc634ace18add8b0b499774056a6c55c1b.zip | |
Merge "Simplify push error message when ref already exists"
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/api')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java | 2 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java | 2 |
2 files changed, 2 insertions, 2 deletions
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 4fb3c174cd..0cd478cd54 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/CreateBranchCommand.java @@ -131,7 +131,7 @@ public class CreateBranchCommand extends GitCommand<Ref> { && refToCheck.getName().startsWith(Constants.R_HEADS); if (!force && exists) throw new RefAlreadyExistsException(MessageFormat.format( - JGitText.get().refAlreadyExists, name)); + JGitText.get().refAlreadyExists1, 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 f9cb828d8e..22f4ef9862 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/api/RenameBranchCommand.java @@ -108,7 +108,7 @@ public class RenameBranchCommand extends GitCommand<Ref> { String fullNewName; if (repo.getRef(newName) != null) throw new RefAlreadyExistsException(MessageFormat.format( - JGitText.get().refAlreadyExists, newName)); + JGitText.get().refAlreadyExists1, newName)); if (oldName != null) { Ref ref = repo.getRef(oldName); if (ref == null) |