diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-03-16 00:12:49 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-03-16 00:26:37 +0100 |
| commit | 405fdf76d55d52aa50f92d03abf9b9fe3ce380dc (patch) | |
| tree | 69d00d17d4a7d58199c592150c9cf39b9d7c75ea /org.eclipse.jgit/resources/org | |
| parent | 79f85d1cf2464f4e3c6eb328674972563c2574dd (diff) | |
| parent | 4c558225dc991a34d59bc4fb0d4e6f1f6974f53c (diff) | |
| download | jgit-405fdf76d55d52aa50f92d03abf9b9fe3ce380dc.tar.gz jgit-405fdf76d55d52aa50f92d03abf9b9fe3ce380dc.zip | |
Merge branch 'stable-4.5' into stable-4.6
* stable-4.5:
Don't remove pack when FileNotFoundException is transient
Change-Id: Ic17c542d78a4cad48ff1ed77dcdc853a4ef2dc06
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 4 |
1 files changed, 2 insertions, 2 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 b9b74bfc21..992b80b32a 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -270,7 +270,7 @@ exceptionCaughtDuringExcecutionOfCommand=Exception caught during execution of co exceptionHookExecutionInterrupted=Execution of "{0}" hook interrupted. exceptionOccurredDuringAddingOfOptionToALogCommand=Exception occurred during adding of {0} as option to a Log command exceptionOccurredDuringReadingOfGIT_DIR=Exception occurred during reading of $GIT_DIR/{0}. {1} -exceptionWhileReadingPack=ERROR: Exception caught while accessing pack file {0}, the pack file might be corrupt +exceptionWhileReadingPack=ERROR: Exception caught while accessing pack file {0}, the pack file might be corrupt, {1}. Caught {2} consecutive errors while trying to read this pack. expectedACKNAKFoundEOF=Expected ACK/NAK, found EOF expectedACKNAKGot=Expected ACK/NAK, got: {0} expectedBooleanStringValue=Expected boolean string value @@ -474,7 +474,7 @@ packfileIsTruncated=Packfile {0} is truncated. packfileIsTruncatedNoParam=Packfile is truncated. packHandleIsStale=Pack file {0} handle is stale, removing it from pack list packHasUnresolvedDeltas=pack has unresolved deltas -packInaccessible=Pack file {0} now inaccessible; removing it from pack list +packInaccessible=Failed to access pack file {0}, caught {2} consecutive errors while trying to access this pack. packingCancelledDuringObjectsWriting=Packing cancelled during objects writing packObjectCountMismatch=Pack object count mismatch: pack {0} index {1}: {2} packRefs=Pack refs |