diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 10:05:36 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 10:12:48 +0200 |
| commit | 5a583ef39357bde7700882f6d6ad72a8f3af8603 (patch) | |
| tree | 06a6dbcd94306f640e829a88fcffd1192a327ecf /org.eclipse.jgit/resources/org/eclipse | |
| parent | b67aacda2fcf2f229e80a3eb2c7aabfcb0b6a51b (diff) | |
| parent | 9e26cb106fad40f26056f91e352f40239eacb213 (diff) | |
| download | jgit-5a583ef39357bde7700882f6d6ad72a8f3af8603.tar.gz jgit-5a583ef39357bde7700882f6d6ad72a8f3af8603.zip | |
Merge branch 'stable-4.10' into stable-4.11
* stable-4.10:
Fix atomic lock file creation on NFS
Use constant for ".lock"
Fix handling of option core.supportsAtomicCreateNewFile
GC: Avoid logging errors when deleting non-empty folders
Change-Id: Ie86079d9ad76972306bc80e63d8bfe18ae06a0da
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
| -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 0d8ba01e22..3f845556e1 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -125,6 +125,7 @@ checkoutUnexpectedResult=Checkout returned unexpected result {0} classCastNotA=Not a {0} cloneNonEmptyDirectory=Destination path "{0}" already exists and is not an empty directory closed=closed +closeLockTokenFailed=Closing LockToken ''{0}'' failed 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} @@ -298,6 +299,7 @@ expectedLessThanGot=expected less than ''{0}'', got ''{1}'' expectedPktLineWithService=expected pkt-line with ''# service=-'', got ''{0}'' expectedReceivedContentType=expected Content-Type {0}; received Content-Type {1} expectedReportForRefNotReceived={0}: expected report for ref {1} not received +failedAtomicFileCreation=Atomic file creation failed, number of hard links to file {0} was not 2 but {1}" failedToDetermineFilterDefinition=An exception occured while determining filter definitions failedUpdatingRefs=failed updating refs failureDueToOneOfTheFollowing=Failure due to one of the following: @@ -722,6 +724,7 @@ unknownObjectType2=unknown unknownRepositoryFormat=Unknown repository format unknownRepositoryFormat2=Unknown repository format "{0}"; expected "0". unknownZlibError=Unknown zlib error. +unlockLockFileFailed=Unlocking LockFile ''{0}'' failed unmergedPath=Unmerged path: {0} unmergedPaths=Repository contains unmerged paths unpackException=Exception while parsing pack stream |