diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2021-05-11 00:55:54 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2021-05-11 00:55:54 +0200 |
| commit | 587c7eab45b0a50c754ad93860416a00ef08c17f (patch) | |
| tree | a5486f0374c03354165ee8b060bcb741b7c279ac /org.eclipse.jgit/resources/org/eclipse/jgit | |
| parent | 5d925ecbb3d0977c586f0001baf20aff12823de9 (diff) | |
| parent | f2e5bace4841758927d47db7d20e4a6f7353ce57 (diff) | |
| download | jgit-587c7eab45b0a50c754ad93860416a00ef08c17f.tar.gz jgit-587c7eab45b0a50c754ad93860416a00ef08c17f.zip | |
Merge branch 'stable-5.8' into stable-5.9
* stable-5.8:
LockFile: create OutputStream only when needed
Remove ReftableNumbersNotIncreasingException
Change-Id: I3274c97cf560398c3c4c27d6759500452f315db0
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse/jgit')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 3 |
1 files changed, 3 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 0e51eb45cb..c5e7dc3efa 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -404,11 +404,14 @@ listingPacks=Listing packs localObjectsIncomplete=Local objects incomplete. localRefIsMissingObjects=Local ref {0} is missing object(s). localRepository=local repository +lockAlreadyHeld=Lock on {0} already held lockCountMustBeGreaterOrEqual1=lockCount must be >= 1 lockError=lock error: {0} lockFailedRetry=locking {0} failed after {1} retries lockOnNotClosed=Lock on {0} not closed. lockOnNotHeld=Lock on {0} not held. +lockStreamClosed=Output to lock on {0} already closed +lockStreamMultiple=Output to lock on {0} already opened logInconsistentFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: {} > {}, but diff = {}. Aborting measurement at resolution {}. logLargerFiletimeDiff={}: inconsistent duration from file timestamps on {}, {}: diff = {} > {} (last good value). Aborting measurement. logSmallerFiletime={}: got smaller file timestamp on {}, {}: {} < {}. Aborting measurement at resolution {}. |