diff options
| author | Shawn O. Pearce <spearce@spearce.org> | 2012-10-17 07:55:15 -0700 |
|---|---|---|
| committer | Shawn O. Pearce <spearce@spearce.org> | 2012-10-17 18:04:25 -0700 |
| commit | 99e9a3bdc610f91e7dd7a78af3c5c9ce8b01a7a7 (patch) | |
| tree | 41efc4e36dfec0bca4f2fc8b9344b355d9a4b6d4 /org.eclipse.jgit/resources/org | |
| parent | 5fc7bd783be8513eea441bd14d573f69ba88f175 (diff) | |
| download | jgit-99e9a3bdc610f91e7dd7a78af3c5c9ce8b01a7a7.tar.gz jgit-99e9a3bdc610f91e7dd7a78af3c5c9ce8b01a7a7.zip | |
Simplify push error message when ref already exists
If a client attempts to create a branch that already exists on the
remote side, tell them "already exists" rather than repeat lots of
information about the reference. Previously the error looked like:
! [remote rejected] tags/1.3.1 -> 1.3.1 (Ref Ref[refs/tags/1.3.1=e3857ee05...] already exists)
Now it will simply say:
! [remote rejected] tags/1.3.1 -> 1.3.1 (already exists)
Change-Id: I96fc67ca8b650052de6e662449a3c5bc8bbc010b
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties index 2e974d6252..8a0ce87ee1 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -377,7 +377,8 @@ readTimedOut=Read timed out receivePackObjectTooLarge1=Object too large, rejecting the pack. Max object size limit is {0} bytes. receivePackObjectTooLarge2=Object too large ({0} bytes), rejecting the pack. Max object size limit is {1} bytes. receivingObjects=Receiving objects -refAlreadyExists=Ref {0} already exists +refAlreadyExists=already exists +refAlreadyExists1=Ref {0} already exists reflogEntryNotFound=Entry {0} not found in reflog for ''{1}'' refNotResolved=Ref {0} can not be resolved refUpdateReturnCodeWas=RefUpdate return code was: {0} |