Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Sohn2017-12-10 17:10:25 +0000
committerMatthias Sohn2017-12-10 17:10:34 +0000
commit032750acbfce756dd143f02ec09087e183ee4e6c (patch)
treea59079daa991fff8c85ccb8b5bbef49f34e1ae4d /org.eclipse.jgit/resources
parentcde32497b5399168ef0262075775eceaf4a57574 (diff)
parent7ccf38adc60c12606164655386630b4e296baf13 (diff)
downloadjgit-032750acbfce756dd143f02ec09087e183ee4e6c.tar.gz
jgit-032750acbfce756dd143f02ec09087e183ee4e6c.tar.xz
jgit-032750acbfce756dd143f02ec09087e183ee4e6c.zip
Merge branch 'stable-4.9'
* stable-4.9: Fix IllegalThreadStateException if stderr closed without exiting Change-Id: I8a6a6788c2bb000171233b88d9592ed0640ad15e
Diffstat (limited to 'org.eclipse.jgit/resources')
-rw-r--r--org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties2
1 files changed, 2 insertions, 0 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 481cebcaa2..b900306c32 100644
--- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
+++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
@@ -122,6 +122,7 @@ classCastNotA=Not a {0}
cloneNonEmptyDirectory=Destination path "{0}" already exists and is not an empty directory
closed=closed
collisionOn=Collision on {0}
+commandClosedStderrButDidntExit=Command {0} closed stderr stream but didn''t exit within timeout {1} seconds
commandRejectedByHook=Rejected by "{0}" hook.\n{1}
commandWasCalledInTheWrongState=Command {0} was called in the wrong state
commitAlreadyExists=exists {0}
@@ -648,6 +649,7 @@ tagAlreadyExists=tag ''{0}'' already exists
tagNameInvalid=tag name {0} is invalid
tagOnRepoWithoutHEADCurrentlyNotSupported=Tag on repository without HEAD currently not supported
theFactoryMustNotBeNull=The factory must not be null
+threadInterruptedWhileRunning="Current thread interrupted while running {0}"
timeIsUncertain=Time is uncertain
timerAlreadyTerminated=Timer already terminated
tooManyCommands=Too many commands

Back to the top