From: Matthias Sohn Date: Sat, 25 Aug 2018 14:07:20 +0000 (+0200) Subject: Merge branch 'stable-5.0' X-Git-Tag: v5.1.0.201808281540-m3~9 X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=851f2399515db1f06496b47eefa51a8c5b0c86d7;p=jgit.git Merge branch 'stable-5.0' * stable-5.0: 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: I9e7fa37b100a7ea3cbe4104802d36c6f38df9e08 Signed-off-by: Matthias Sohn --- 851f2399515db1f06496b47eefa51a8c5b0c86d7 diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target index 9ae9a28491,dfb5a8f442..6fad8129fa --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.5.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target index 6a6ea8d0a5,dbfd694b24..a17f16f610 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.6.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target index c271a1c896,be7719d88f..c421270f75 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.7.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target index 86342dde54,3de172b822..2e4a812e69 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.target @@@ -1,26 -1,26 +1,26 @@@ - - ++ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd index 9c2d3f9270,0ea2b99f32..341fbd0dc4 --- a/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.8.tpd @@@ -1,8 -1,8 +1,8 @@@ target "jgit-4.8" with source configurePhase -include "projects/jetty-9.4.8.tpd" -include "orbit/R20180606145124-Photon.tpd" +include "projects/jetty-9.4.11.tpd" +include "orbit/S20180730183850-2018-09.tpd" - location "http://download.eclipse.org/releases/oxygen/" { + location "http://download.eclipse.org/releases/photon/" { org.eclipse.osgi lazy } diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.target index 0000000000,0000000000..9064c1b32c new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.target @@@ -1,0 -1,0 +1,76 @@@ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ diff --cc org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.tpd index 0000000000,0000000000..2319e92740 new file mode 100644 --- /dev/null +++ b/org.eclipse.jgit.packaging/org.eclipse.jgit.target/jgit-4.9-staging.tpd @@@ -1,0 -1,0 +1,8 @@@ ++target "jgit-4.9-staging" with source configurePhase ++ ++include "projects/jetty-9.4.11.tpd" ++include "orbit/S20180730183850-2018-09.tpd" ++ ++location "http://download.eclipse.org/staging/2018-09/" { ++ org.eclipse.osgi lazy ++} diff --cc org.eclipse.jgit/.settings/.api_filters index b7b49bc658,0000000000..9f4b761495 mode 100644,000000..100644 --- a/org.eclipse.jgit/.settings/.api_filters +++ b/org.eclipse.jgit/.settings/.api_filters @@@ -1,33 -1,0 +1,17 @@@ + + + + + + + + + - - - - - - - - - - - - - - - - + + + + + + + - ++ diff --cc org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java index 7d2bd4897a,b088d72660..40c6de33fa --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java @@@ -1287,8 -1288,12 +1288,12 @@@ public class RefDirectory extends RefDa for (int i = 0; i < depth; ++i) { try { Files.delete(dir.toPath()); + } catch (DirectoryNotEmptyException e) { + // Don't log; normal case when there are other refs with the + // same prefix + break; } catch (IOException e) { - LOG.warn("Unable to remove path {}", dir, e); + LOG.warn("Unable to remove path {}", dir, e); //$NON-NLS-1$ break; } dir = dir.getParentFile();