From: Matthias Sohn <matthias.sohn@sap.com>
Date: Tue, 31 Jan 2023 23:30:52 +0000 (+0100)
Subject: Merge branch 'stable-5.13' into stable-6.0
X-Git-Tag: v6.5.0.202302011120-m2~1^2^2^2^2^2^2
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=da21265a141b68ea3069afd79107f7d374027bc0;p=jgit.git

Merge branch 'stable-5.13' into stable-6.0

* stable-5.13:
  Shortcut during git fetch for avoiding looping through all local refs
  FetchCommand: fix fetchSubmodules to work on a Ref to a blob
  Silence API warnings introduced by I466dcde6
  Allow the exclusions of refs prefixes from bitmap
  PackWriterBitmapPreparer: do not include annotated tags in bitmap
  BatchingProgressMonitor: avoid int overflow when computing percentage
  Speedup GC listing objects referenced from reflogs
  FileSnapshotTest: Add more MISSING_FILE coverage

Change-Id: I58ad4c210a5e7e5a1ba6b22315b04211c8909950
---

da21265a141b68ea3069afd79107f7d374027bc0
diff --cc org.eclipse.jgit.http.server/.settings/.api_filters
index 951a53bf38,951a53bf38..0000000000
deleted file mode 100644,100644
--- a/org.eclipse.jgit.http.server/.settings/.api_filters
+++ /dev/null
@@@ -1,17 -1,17 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<component id="org.eclipse.jgit.http.server" version="2">
--    <resource path="src/org/eclipse/jgit/http/server/GitServlet.java" type="org.eclipse.jgit.http.server.GitServlet">
--        <filter id="1142947843">
--            <message_arguments>
--                <message_argument value="5.9.1"/>
--                <message_argument value="setReceivePackErrorHandler(ReceivePackErrorHandler)"/>
--            </message_arguments>
--        </filter>
--        <filter id="1142947843">
--            <message_arguments>
--                <message_argument value="5.9.1"/>
--                <message_argument value="setUploadPackErrorHandler(UploadPackErrorHandler)"/>
--            </message_arguments>
--        </filter>
--    </resource>
--</component>
diff --cc org.eclipse.jgit/.settings/.api_filters
index d9840c700a,cc4916cf8b..0000000000
deleted file mode 100644,100644
--- a/org.eclipse.jgit/.settings/.api_filters
+++ /dev/null
@@@ -1,113 -1,142 +1,0 @@@
--<?xml version="1.0" encoding="UTF-8" standalone="no"?>
--<component id="org.eclipse.jgit" version="2">
-     <resource path="src/org/eclipse/jgit/errors/NoRemoteRepositoryException.java" type="org.eclipse.jgit.errors.NoRemoteRepositoryException">
 -    <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.1"/>
-                 <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
 -                <message_argument value="5.13.2"/>
 -                <message_argument value="CONFIG_KEY_BITMAP_EXCLUDED_REFS_PREFIXES"/>
--            </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="SHA1_IMPLEMENTATION"/>
 -            </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/storage/pack/PackConfig.java" type="org.eclipse.jgit.storage.pack.PackConfig">
--        <filter id="336658481">
--            <message_arguments>
-                 <message_argument value="5.13"/>
-                 <message_argument value="6.0"/>
-                 <message_argument value="NoRemoteRepositoryException(URIish, String, Throwable)"/>
 -                <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_SEARCH_FOR_REUSE_TIMEOUT"/>
 -            </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>
--    </resource>
-     <resource path="src/org/eclipse/jgit/transport/AwsRequestSignerV4.java" type="org.eclipse.jgit.transport.AwsRequestSignerV4">
-         <filter id="1109393411">
 -    <resource path="src/org/eclipse/jgit/transport/BasePackPushConnection.java" type="org.eclipse.jgit.transport.BasePackPushConnection">
 -        <filter id="338792546">
--            <message_arguments>
-                 <message_argument value="5.13.1"/>
-                 <message_argument value="org.eclipse.jgit.transport.AwsRequestSignerV4"/>
 -                <message_argument value="org.eclipse.jgit.transport.BasePackPushConnection"/>
 -                <message_argument value="noRepository()"/>
--            </message_arguments>
--        </filter>
--    </resource>
-     <resource path="src/org/eclipse/jgit/util/HttpSupport.java" type="org.eclipse.jgit.util.HttpSupport">
-         <filter id="1142947843">
 -    <resource path="src/org/eclipse/jgit/transport/ProtocolV2Hook.java" type="org.eclipse.jgit.transport.ProtocolV2Hook">
 -        <filter id="404000815">
--            <message_arguments>
-                 <message_argument value="5.13.1"/>
-                 <message_argument value="urlEncode(String, boolean)"/>
 -                <message_argument value="org.eclipse.jgit.transport.ProtocolV2Hook"/>
 -                <message_argument value="onObjectInfo(ObjectInfoRequest)"/>
--            </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>