diff options
author | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 02:09:37 +0100 |
---|---|---|
committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 02:09:37 +0100 |
commit | 7e3e740cc7a8b4973534152070c827ec2ad809fa (patch) | |
tree | 7d1f82460c99693bb4f9c4385d7fb48e6728ad3e /org.eclipse.jgit/resources/org/eclipse | |
parent | 9f1dad4d4f98fbe1c4f89e73d09f7cbda2a4db75 (diff) | |
parent | 3d59d1b80cd90bf22a43e522d372d72f0c2ee8a6 (diff) | |
download | jgit-7e3e740cc7a8b4973534152070c827ec2ad809fa.tar.gz jgit-7e3e740cc7a8b4973534152070c827ec2ad809fa.zip |
Merge branch 'stable-5.6' into stable-5.7
* stable-5.6:
Fix string format parameter for invalidRefAdvertisementLine
WindowCache: add metric for cached bytes per repository
pgm daemon: fallback to user and system config if no config specified
WindowCache: add option to use strong refs to reference ByteWindows
Replace usage of ArrayIndexOutOfBoundsException in treewalk
Add config constants for WindowCache configuration options
Change-Id: I79d615dff66493b60d3a4bcbdc57b9455e8d6673
Diffstat (limited to 'org.eclipse.jgit/resources/org/eclipse')
-rw-r--r-- | org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties | 2 |
1 files changed, 1 insertions, 1 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 fb1bd9f3c8..153399ca34 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -373,7 +373,7 @@ invalidPacketLineHeader=Invalid packet line header: {0} invalidPath=Invalid path: {0} invalidPurgeFactor=Invalid purgeFactor {0}, values have to be in range between 0 and 1 invalidRedirectLocation=Invalid redirect location {0} -> {1} -invalidRefAdvertisementLine=Invalid ref advertisement line: ''{1}'' +invalidRefAdvertisementLine=Invalid ref advertisement line: ''{0}'' invalidReflogRevision=Invalid reflog revision: {0} invalidRefName=Invalid ref name: {0} invalidReftableBlock=Invalid reftable block |