diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2017-03-16 00:29:43 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2017-03-16 00:29:43 +0100 |
| commit | dab8e0e7cb2cffd657d3b840c5cd39d11df09419 (patch) | |
| tree | f59c1d1adb857b4e254bae16bf9a60734bdbe262 /org.eclipse.jgit/resources | |
| parent | ca4223f2ce17462fd64fbaf949287fb83c244673 (diff) | |
| parent | 405fdf76d55d52aa50f92d03abf9b9fe3ce380dc (diff) | |
| download | jgit-dab8e0e7cb2cffd657d3b840c5cd39d11df09419.tar.gz jgit-dab8e0e7cb2cffd657d3b840c5cd39d11df09419.zip | |
Merge branch 'stable-4.6'
* stable-4.6:
Don't remove pack when FileNotFoundException is transient
Change-Id: I82941a98385cda27c89e1e6750b7b6db4e39f414
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources')
| -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 6ac5813e73..b659c015bb 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -271,7 +271,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 @@ -475,7 +475,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 |