diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2019-11-11 11:07:01 -0800 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2019-11-11 11:07:17 -0800 |
| commit | 826317942f79f550bae811927106b658dce80472 (patch) | |
| tree | bc40928caa4a1f43b9bf398e1d9fbd79a9454245 /org.eclipse.jgit/resources | |
| parent | a7412b544bea81ea0bc53979e384e9ba1ed05d9e (diff) | |
| parent | ca800b55c8ff1f97afd2f7fe707d54b84f6df9c3 (diff) | |
| download | jgit-826317942f79f550bae811927106b658dce80472.tar.gz jgit-826317942f79f550bae811927106b658dce80472.zip | |
Merge branch 'stable-5.5'
* stable-5.5:
BaseReceivePack: Fix the format
Prepend hostname to subsection used to store file timestamp resolution
Store filesystem timestamp resolution in extra jgit config
SystemReader: extract updating config and its parents if outdated
Change-Id: Iecfddce8081303af29badcdcd3d72a0da50c964f
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 | 2 |
1 files changed, 2 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 7391826c05..52eaa1fc2d 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -201,8 +201,10 @@ countingObjects=Counting objects corruptPack=Pack file {0} is corrupt, removing it from pack list createBranchFailedUnknownReason=Create branch failed for unknown reason createBranchUnexpectedResult=Create branch returned unexpected result {0} +createJGitConfigFailed=Creating JGit config directory {} failed createNewFileFailed=Could not create new file {0} createRequiresZeroOldId=Create requires old ID to be zero +createXDGConfigHomeFailed=Creating XDG_CONFIG_HOME directory {} failed credentialPassword=Password credentialPassphrase=Passphrase credentialUsername=Username |