Merge branch 'stable-6.0' into stable-6.1

* stable-6.0:
  PackConfig: fix @since tags
  Remove unused API problem filters
  Add support for git config repack.packKeptObjects
  Do not exclude objects in locked packs from bitmap processing

Change-Id: I0c9c0b3c206cac03a93b30eda348177a4de35c36

diff --cc Documentation/config-options.md
Simple merge

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

diff --cc org.eclipse.jgit/.settings/.api_filters
index 79b6067efdede8db34c54d87b3d0c159c337893f,0000000000000000000000000000000000000000..811c3600afe83fbda6b38a5de41e244f7233bb06
mode 100644,000000..100644
--- 1/org.eclipse.jgit/.settings/.api_filters
--- /dev/null
+++ b/org.eclipse.jgit/.settings/.api_filters
@@@ -1,248 -1,0 +1,292 @@@
 +<?xml version="1.0" encoding="UTF-8" standalone="no"?>
 +<component id="org.eclipse.jgit" version="2">
++    <resource path="src/org/eclipse/jgit/api/GarbageCollectCommand.java" type="org.eclipse.jgit.api.GarbageCollectCommand">
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="setPackKeptObjects(boolean)"/>
++            </message_arguments>
++        </filter>
++    </resource>
 +    <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.1"/>
 +                <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.9.1"/>
 +                <message_argument value="isPermanent()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.9.1"/>
 +                <message_argument value="setPermanent(boolean)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="CONFIG_KEY_BITMAP_EXCLUDED_REFS_PREFIXES"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="CONFIG_KEY_PRESERVE_OLD_PACKS"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="CONFIG_KEY_PRUNE_PRESERVED"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="CONFIG_KEY_SKIPHASH"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="SHA1_IMPLEMENTATION"/>
 +            </message_arguments>
 +        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="CONFIG_KEY_PACK_KEPT_OBJECTS"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="CONFIG_REPACK_SECTION"/>
++            </message_arguments>
++        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="6.1.1"/>
 +                <message_argument value="CONFIG_KEY_TRUST_PACKED_REFS_STAT"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/CoreConfig.java" type="org.eclipse.jgit.lib.CoreConfig$TrustPackedRefsStat">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="6.1.1"/>
 +                <message_argument value="TrustPackedRefsStat"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/ObjectDatabase.java" type="org.eclipse.jgit.lib.ObjectDatabase">
 +        <filter id="336695337">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.ObjectDatabase"/>
 +                <message_argument value="getApproximateObjectCount()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/Repository.java" type="org.eclipse.jgit.lib.Repository">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="getReflogReader(Ref)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/lib/TypedConfigGetter.java" type="org.eclipse.jgit.lib.TypedConfigGetter">
 +        <filter id="403767336">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
 +                <message_argument value="UNSET_INT"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="403804204">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.lib.TypedConfigGetter"/>
 +                <message_argument value="getIntInRange(Config, String, String, String, int, int, int)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/merge/ResolveMerger.java" type="org.eclipse.jgit.merge.ResolveMerger">
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="addCheckoutMetadata(String, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="addToCheckout(String, DirCacheEntry, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.merge.ResolveMerger"/>
 +                <message_argument value="processEntry(CanonicalTreeParser, CanonicalTreeParser, CanonicalTreeParser, DirCacheBuildIterator, WorkingTreeIterator, boolean, Attributes)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
 +        <filter id="336658481">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
 +                <message_argument value="DEFAULT_BITMAP_EXCLUDED_REFS_PREFIXES"/>
 +            </message_arguments>
 +        </filter>
++        <filter id="336658481">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/>
++                <message_argument value="DEFAULT_PACK_KEPT_OBJECTS"/>
++            </message_arguments>
++        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="DEFAULT_BITMAP_EXCLUDED_REFS_PREFIXES"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="getBitmapExcludedRefsPrefixes()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="setBitmapExcludedRefsPrefixes(String[])"/>
 +            </message_arguments>
 +        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="DEFAULT_PACK_KEPT_OBJECTS"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="isPackKeptObjects()"/>
++            </message_arguments>
++        </filter>
++        <filter id="1142947843">
++            <message_arguments>
++                <message_argument value="5.13.3"/>
++                <message_argument value="setPackKeptObjects(boolean)"/>
++            </message_arguments>
++        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4">
 +        <filter id="1109393411">
 +            <message_arguments>
 +                <message_argument value="5.13.1"/>
 +                <message_argument value="org.eclipse.jgit.transport.AwsRequestSignerV4"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/BasePackPushConnection.java" type="org.eclipse.jgit.transport.BasePackPushConnection">
 +        <filter id="338792546">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.BasePackPushConnection"/>
 +                <message_argument value="noRepository()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/transport/PushConfig.java" type="org.eclipse.jgit.transport.PushConfig">
 +        <filter id="338722907">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.transport.PushConfig"/>
 +                <message_argument value="PushConfig()"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.1"/>
 +                <message_argument value="urlEncode(String, boolean)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1">
 +        <filter id="337764418">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="digest()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="digest(MutableObjectId)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="hasCollision()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="reset()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="setDetectCollision(boolean)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="toObjectId()"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="update(byte)"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="update(byte[])"/>
 +            </message_arguments>
 +        </filter>
 +        <filter id="421650549">
 +            <message_arguments>
 +                <message_argument value="org.eclipse.jgit.util.sha1.SHA1"/>
 +                <message_argument value="update(byte[], int, int)"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +    <resource path="src/org/eclipse/jgit/util/sha1/SHA1.java" type="org.eclipse.jgit.util.sha1.SHA1$Sha1Implementation">
 +        <filter id="1142947843">
 +            <message_arguments>
 +                <message_argument value="5.13.2"/>
 +                <message_argument value="Sha1Implementation"/>
 +            </message_arguments>
 +        </filter>
 +    </resource>
 +</component>

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