]> source.dussan.org Git - jgit.git/commitdiff
Merge branch 'stable-5.2' into stable-5.3 54/148854/1
authorMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 22:32:42 +0000 (00:32 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Tue, 3 Sep 2019 22:49:42 +0000 (00:49 +0200)
* stable-5.2:
  Prepare 5.1.12-SNAPSHOT builds
  JGit v5.1.11.201909031202-r
  Prepare 4.11.10-SNAPSHOT builds
  JGit v4.11.9.201909030838-r
  Bazel: Update bazlets to the latest master revision
  Bazel: Remove FileTreeIteratorWithTimeControl from BUILD file
  BatchRefUpdate: repro racy atomic update, and fix it
  Delete unused FileTreeIteratorWithTimeControl
  Fix RacyGitTests#testRacyGitDetection
  Change RacyGitTests to create a racy git situation in a stable way
  Silence API warnings

Change-Id: I7e88c7c7d202f1e3fb8e143277650aa5fefff439
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
1  2 
WORKSPACE
org.eclipse.jgit/.settings/.api_filters

diff --cc WORKSPACE
Simple merge
index 33630a812b4ff0496632857fb83bb31697a8a2af,857fcac17df6f00d503cbc67d037862b23386e8a..14856a2c8c7f8f192c39beff4d56ae4378bf9a88
              </message_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/lib/GitmoduleEntry.java" type="org.eclipse.jgit.lib.GitmoduleEntry">
 -        <filter id="1109393411">
++    <resource path="src/org/eclipse/jgit/lib/ObjectIdRef.java" type="org.eclipse.jgit.lib.ObjectIdRef">
++        <filter id="338722907">
+             <message_arguments>
 -                <message_argument value="4.7.5"/>
 -                <message_argument value="org.eclipse.jgit.lib.GitmoduleEntry"/>
++                <message_argument value="org.eclipse.jgit.lib.ObjectIdRef"/>
++                <message_argument value="ObjectIdRef(Ref.Storage, String, ObjectId)"/>
+             </message_arguments>
+         </filter>
+     </resource>
 -    <resource path="src/org/eclipse/jgit/lib/ObjectChecker.java" type="org.eclipse.jgit.lib.ObjectChecker">
 -        <filter id="1142947843">
++    <resource path="src/org/eclipse/jgit/lib/Ref.java" type="org.eclipse.jgit.lib.Ref">
++        <filter id="404000815">
+             <message_arguments>
 -                <message_argument value="4.7.5"/>
 -                <message_argument value="getGitsubmodules()"/>
++                <message_argument value="org.eclipse.jgit.lib.Ref"/>
++                <message_argument value="getUpdateIndex()"/>
+             </message_arguments>
+         </filter>
+     </resource>
 -    <resource path="src/org/eclipse/jgit/revwalk/DepthWalk.java" type="org.eclipse.jgit.revwalk.DepthWalk">
 -        <filter id="403804204">
++    <resource path="src/org/eclipse/jgit/lib/RefDatabase.java" type="org.eclipse.jgit.lib.RefDatabase">
++        <filter id="421650549">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 -                <message_argument value="getDeepenNotFlag()"/>
++                <message_argument value="org.eclipse.jgit.lib.RefDatabase"/>
++                <message_argument value="exactRef(String)"/>
+             </message_arguments>
+         </filter>
 -        <filter id="404000815">
++        <filter id="421654647">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 -                <message_argument value="getDeepenNots()"/>
 -            </message_arguments>
 -        </filter>
 -        <filter id="404000815">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.revwalk.DepthWalk"/>
 -                <message_argument value="getDeepenSince()"/>
++                <message_argument value="org.eclipse.jgit.lib.RefDatabase"/>
++                <message_argument value="getRef(String)"/>
+             </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_arguments>
          </filter>
      </resource>
 -    <resource path="src/org/eclipse/jgit/transport/RemoteSession.java" type="org.eclipse.jgit.transport.RemoteSession">
 -        <filter id="404000815">
++    <resource path="src/org/eclipse/jgit/transport/BaseReceivePack.java" type="org.eclipse.jgit.transport.BaseReceivePack">
++        <filter id="421650549">
+             <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.RemoteSession"/>
 -                <message_argument value="getFtpChannel()"/>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="getAdvertisedRefs()"/>
++            </message_arguments>
++        </filter>
++        <filter id="421650549">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="getPushCertificate()"/>
++            </message_arguments>
++        </filter>
++        <filter id="421650549">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="getRepository()"/>
++            </message_arguments>
++        </filter>
++        <filter id="421650549">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="getRevWalk()"/>
++            </message_arguments>
++        </filter>
++        <filter id="421650549">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="setAdvertisedRefs(Map&lt;String,Ref&gt;, Set&lt;ObjectId&gt;)"/>
++            </message_arguments>
++        </filter>
++        <filter id="421650549">
++            <message_arguments>
++                <message_argument value="org.eclipse.jgit.transport.BaseReceivePack"/>
++                <message_argument value="setPushCertificate(PushCertificate)"/>
+             </message_arguments>
+         </filter>
+     </resource>
+     <resource path="src/org/eclipse/jgit/transport/TransferConfig.java" type="org.eclipse.jgit.transport.TransferConfig">
+         <filter id="1159725059">
+             <message_arguments>
+                 <message_argument value="5.1.4"/>
+                 <message_argument value="TransferConfig(Config)"/>
+             </message_arguments>
+         </filter>
+         <filter id="1159725059">
+             <message_arguments>
+                 <message_argument value="5.1.4"/>
+                 <message_argument value="TransferConfig(Repository)"/>
+             </message_arguments>
+         </filter>
+     </resource>
 -    <resource path="src/org/eclipse/jgit/transport/http/HttpConnection.java" type="org.eclipse.jgit.transport.http.HttpConnection">
 -        <filter id="403804204">
 -            <message_arguments>
 -                <message_argument value="org.eclipse.jgit.transport.http.HttpConnection"/>
 -                <message_argument value="getHeaderFields(String)"/>
 -            </message_arguments>
 -        </filter>
 -    </resource>
      <resource path="src/org/eclipse/jgit/treewalk/WorkingTreeIterator.java" type="org.eclipse.jgit.treewalk.WorkingTreeIterator">
          <filter id="1142947843">
              <message_arguments>