diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 01:57:03 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 02:06:47 +0100 |
| commit | 3d59d1b80cd90bf22a43e522d372d72f0c2ee8a6 (patch) | |
| tree | 4b43af597cf67cf0f785403075f6600782c88f5d /org.eclipse.jgit/resources | |
| parent | d7304eddaf393375cea93433db182841fd5e08ef (diff) | |
| parent | 68b0645a2ed7d6002abe523dd5af51063e0a5c47 (diff) | |
| download | jgit-3d59d1b80cd90bf22a43e522d372d72f0c2ee8a6.tar.gz jgit-3d59d1b80cd90bf22a43e522d372d72f0c2ee8a6.zip | |
Merge branch 'stable-5.5' into stable-5.6
* stable-5.5:
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: I73d16b53df02bf735c2431588143efe225a4b5b4
Diffstat (limited to 'org.eclipse.jgit/resources')
| -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 27d3e6aaa3..dd9ee3d23f 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -372,7 +372,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 |