diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 07:19:13 +0200 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2018-09-08 08:58:12 +0200 |
| commit | 8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535 (patch) | |
| tree | db9869ed686c719ac8b004708b42c9442e136828 /org.eclipse.jgit/resources | |
| parent | b270e4b740a3b974bd5029fae224edc8ec088025 (diff) | |
| parent | 06e06fc291a8ccc0e68b7d84b54097a9635df740 (diff) | |
| download | jgit-8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535.tar.gz jgit-8699a95d2d1ed0d3ad7b3022a408e3b9e8e66535.zip | |
Merge branch 'stable-4.7' into stable-4.8
* stable-4.7:
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: Ia7a18f69eee173aec9e462c16eee2b0ca4565e76
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 | 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 4d2e38e7e3..8fce30a2af 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -119,6 +119,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} commandRejectedByHook=Rejected by "{0}" hook.\n{1} commandWasCalledInTheWrongState=Command {0} was called in the wrong state @@ -284,6 +285,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: @@ -669,6 +671,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 |