diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 01:41:52 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 01:53:27 +0100 |
| commit | 68b0645a2ed7d6002abe523dd5af51063e0a5c47 (patch) | |
| tree | b54ac9ea48d534d76ac927cc051e9631e7cee0b6 /org.eclipse.jgit/resources/org/eclipse | |
| parent | 5cfa74c7b128c1a9fa3fa4b9c6093c5a946457fa (diff) | |
| parent | 195b8fc94c11146f5aa495ba975b82dfa3516a26 (diff) | |
| download | jgit-68b0645a2ed7d6002abe523dd5af51063e0a5c47.tar.gz jgit-68b0645a2ed7d6002abe523dd5af51063e0a5c47.zip | |
Merge branch 'stable-5.4' into stable-5.5
* stable-5.4:
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: I76a62da98182f0c504b1ea8b7d37cecdf4eea7e0
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 b82512f71b..52359d1f12 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -368,7 +368,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 |