]> source.dussan.org Git - jgit.git/commit
Merge branch 'stable-4.11' into stable-5.0 70/127970/3
authorMatthias Sohn <matthias.sohn@sap.com>
Sat, 25 Aug 2018 06:56:45 +0000 (08:56 +0200)
committerMatthias Sohn <matthias.sohn@sap.com>
Sat, 25 Aug 2018 06:56:45 +0000 (08:56 +0200)
commitcde0e313819c0209eb692820fb32f85e5b034e16
treed2501639233921231dd3ce0aab960676120b8808
parent78d7d9916cb84142f0ca03fbeb3a176c4223255e
parent2dfc9ed6d21567a04a8ec3f98ab21ed04fc8c531
Merge branch 'stable-4.11' into stable-5.0

* stable-4.11:
  Silence API warning for new ObjectIdSerializer introduced in 4.11.1
  Ignore API warnings
  Fix photon target platform to use photon version of org.eclipse.osgi
  Update Photon orbit repository to R20180606145124
  Suppress warning for trying to delete non-empty directory
  Fix fetching with duplicate ref updates
  Fetch(Process): should tolerate duplicate refspecs
  FetchCommandTest: test add/update/delete fetch

Change-Id: I2497f99b7d0686a0e0f773c39c8725e813ce9d4a
Signed-off-by: Matthias Sohn <matthias.sohn@sap.com>
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target
org.eclipse.jgit.packaging/org.eclipse.jgit.target/orbit/R20180606145124-Photon.tpd
org.eclipse.jgit.test/tst/org/eclipse/jgit/api/FetchCommandTest.java
org.eclipse.jgit/.settings/.api_filters
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java
org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java