]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-6.1' into stable-6.2 85/199685/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 31 Jan 2023 23:44:41 +0000 (00:44 +0100)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 31 Jan 2023 23:54:30 +0000 (00:54 +0100)
* stable-6.1:
  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: Iff2fba026b49463016015b2fae1a42cf76ee2dbb

1  2 
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/lib/ConfigConstants.java
org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java

index 28bc2a810d8a78a022ac8f7f75360cff815ae238,dcb2c519b9767fffea29047ed45e03fa36b9a88d..3e62b565ffcdbc675f1d359df62533965939363a
@@@ -1,6 -1,20 +1,12 @@@
  <?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">
 -        <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/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_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="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">
              <message_arguments>