diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-02-22 01:28:27 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-02-22 01:28:27 +0100 |
| commit | dcd6367391b02e6cf70fe73e1cb76a1d656e988a (patch) | |
| tree | eb1839f9d4580712fc7efd87ef8fe10e3c120826 /org.eclipse.jgit/resources | |
| parent | f8e6bcba483336280b61771deb09622438953cb2 (diff) | |
| parent | c70374e64145b624c9632616480f7eda4105e805 (diff) | |
| download | jgit-dcd6367391b02e6cf70fe73e1cb76a1d656e988a.tar.gz jgit-dcd6367391b02e6cf70fe73e1cb76a1d656e988a.zip | |
Merge branch 'stable-6.3' into stable-6.4
* stable-6.3:
Use Java 11 ProcessHandle to get pid of the current process
Acquire file lock "gc.pid" before running gc
Silence API errors introduced by 9424052f
Change-Id: Ic40dbab18616d8d9fe3820b9890c86652b80eb47
Diffstat (limited to 'org.eclipse.jgit/resources')
| -rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 4 |
1 files changed, 4 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 93269d5d62..2460c1593a 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -139,6 +139,7 @@ classCastNotA=Not a {0} cloneNonEmptyDirectory=Destination path "{0}" already exists and is not an empty directory closed=closed closeLockTokenFailed=Closing LockToken ''{0}'' failed +closePidLockFailed=Closing lock file ''{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} @@ -314,6 +315,7 @@ 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} failedCreateLockFile=Creating lock file {} failed +failedPidLock=Failed to lock ''{0}'' guarding git gc failedReadHttpsProtocols=Failed to read system property https.protocols, assuming it is not set failedToConvert=Failed to convert rest: %s failedToDetermineFilterDefinition=An exception occurred while determining filter definitions @@ -333,6 +335,7 @@ flagIsDisposed={0} is disposed. flagNotFromThis={0} not from this. flagsAlreadyCreated={0} flags already created. funnyRefname=funny refname +gcAlreadyRunning=fatal: gc is already running on machine ''{0}'' pid {1} gcFailed=Garbage collection failed. gcTooManyUnpruned=Too many loose, unpruneable objects after garbage collection. Consider adjusting gc.auto or gc.pruneExpire. headRequiredToStash=HEAD required to stash local changes @@ -699,6 +702,7 @@ sslTrustAlways=Always skip SSL verification for this server from now on sslTrustForRepo=Skip SSL verification for git operations for repository {0} sslTrustNow=Skip SSL verification for this single git operation sslVerifyCannotSave=Could not save setting for http.sslVerify +stalePidLock=Lock file ''{0}'' is older than 12 hours and seems to be stale, lastModified: {1}, trying to lock it staleRevFlagsOn=Stale RevFlags on {0} startingReadStageWithoutWrittenRequestDataPendingIsNotSupported=Starting read stage without written request data pending is not supported stashApplyConflict=Applying stashed changes resulted in a conflict |