aboutsummaryrefslogtreecommitdiffstats
path: root/org.eclipse.jgit/resources
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2011-03-16 21:50:42 -0700
committerShawn O. Pearce <spearce@spearce.org>2011-03-17 10:53:19 -0700
commitc9a6980a422b485c23bfd99a939a378c5dd5114c (patch)
tree63a3a6166fc428f0bb021055c43617a0d9e5415f /org.eclipse.jgit/resources
parentb0a29c3fcfae9f23949db5cbee46db30448531cf (diff)
downloadjgit-c9a6980a422b485c23bfd99a939a378c5dd5114c.tar.gz
jgit-c9a6980a422b485c23bfd99a939a378c5dd5114c.zip
UploadPack: Report invalid want lines with ERR
Instead of aborting hard with a server-side exception, report an error to the client with "ERR %s" in a context where the client is expecting ACK/NAK. Older clients will report this text to the user, but newer ones know how to format this message in a more user-friendly way. Change-Id: I1879b38988ba66f648c069c10dbfa14c3f34adb2 Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties2
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
index 61291f67d0..b606bbb249 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/JGitText.properties
@@ -303,7 +303,6 @@ notASCIIString=Not ASCII string: {0}
notAuthorized=not authorized
notAValidPack=Not a valid pack {0}
notFound=not found.
-notValid={0} not valid
nothingToFetch=Nothing to fetch.
nothingToPush=Nothing to push.
notMergedExceptionMessage=Branch was not deleted as it has not been merged yet; use the force option to delete it anyway
@@ -466,6 +465,7 @@ updatingRefFailed=Updating the ref {0} to {1} failed. ReturnCode from RefUpdate.
uriNotFound={0} not found
userConfigFileInvalid=User config file {0} invalid {1}
walkFailure=Walk failure.
+wantNotValid=want {0} not valid
windowSizeMustBeLesserThanLimit=Window size must be < limit
windowSizeMustBePowerOf2=Window size must be power of 2
writeTimedOut=Write timed out