diff options
| author | David Pursehouse <david.pursehouse@gmail.com> | 2020-01-31 09:12:08 +0900 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2020-02-01 01:09:46 +0100 |
| commit | f57a7bd2306d81ce244621c45a0e569096d8e797 (patch) | |
| tree | 0799a949f5f9a2be5aaf30404b58bd2979490fdf /org.eclipse.jgit/resources/org/eclipse | |
| parent | 0d962eaa78223c09c9bd38bc50440bf82ff03f70 (diff) | |
| parent | 7d5300023e867ae1e259bc5ec3839dff2bc3fab8 (diff) | |
| download | jgit-f57a7bd2306d81ce244621c45a0e569096d8e797.tar.gz jgit-f57a7bd2306d81ce244621c45a0e569096d8e797.zip | |
Merge branch 'stable-5.1' into stable-5.2
* stable-5.1:
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
Change-Id: I741059a1d0d5950ab5bc16ec70352655ee926a24
Signed-off-by: David Pursehouse <david.pursehouse@gmail.com>
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
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 ebb04149d0..b734ce5655 100644 --- a/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties +++ b/org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties @@ -348,7 +348,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 |