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

diff --cc org.eclipse.jgit/.settings/.api_filters
index 2a71030e210af49cb3f91982b39302a4de8fa177,a2066ec3edc29c6ed1db3b48caeb1253b2b906f2..912d96db096327f127466390416bdc4c9ffeb6eb
--- 1/org.eclipse.jgit/.settings/.api_filters
--- 2/org.eclipse.jgit/.settings/.api_filters
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -23,6 -44,54 +23,36 @@@
                  <message_argument value="CONFIG_JMX_SECTION"/>
              </message_arguments>
          </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.9"/>
 -                <message_argument value="CONFIG_FILESYSTEM_SECTION"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.9"/>
 -                <message_argument value="CONFIG_KEY_MIN_RACY_THRESHOLD"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="1142947843">
 -            <message_arguments>
 -                <message_argument value="5.1.9"/>
 -                <message_argument value="CONFIG_KEY_TIMESTAMP_RESOLUTION"/>
 -            </message_arguments>
 -        </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_KEY_PACKED_GIT_LIMIT"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_KEY_PACKED_GIT_MMAP"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_KEY_PACKED_GIT_OPENFILES"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_KEY_PACKED_GIT_USE_STRONGREFS"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="CONFIG_KEY_PACKED_GIT_WINDOWSIZE"/>
+             </message_arguments>
+         </filter>
      </resource>
      <resource path="src/org/eclipse/jgit/lib/Constants.java" type="org.eclipse.jgit.lib.Constants">
          <filter id="1142947843">
@@@ -32,14 -101,20 +62,28 @@@
              </message_arguments>
          </filter>
      </resource>
 +    <resource path="src/org/eclipse/jgit/revwalk/ReachabilityChecker.java" type="org.eclipse.jgit.revwalk.ReachabilityChecker">
 +        <filter id="403804204">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.revwalk.ReachabilityChecker"/>
 +                <message_argument value="areAllReachable(Collection&lt;RevCommit&gt;, Stream&lt;RevCommit&gt;)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
+     <resource path="src/org/eclipse/jgit/storage/file/WindowCacheConfig.java" type="org.eclipse.jgit.storage.file.WindowCacheConfig">
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="isPackedGitUseStrongRefs()"/>
+             </message_arguments>
+         </filter>
+         <filter id="1142947843">
+             <message_arguments>
+                 <message_argument value="5.1.13"/>
+                 <message_argument value="setPackedGitUseStrongRefs(boolean)"/>
+             </message_arguments>
+         </filter>
+     </resource>
      <resource path="src/org/eclipse/jgit/storage/file/WindowCacheStats.java" type="org.eclipse.jgit.storage.file.WindowCacheStats">
          <filter id="337809484">
              <message_arguments>

diff --cc org.eclipse.jgit/resources/org/eclipse/jgit/internal/JGitText.properties
Simple merge

diff --cc org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
Simple merge