diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-03 16:04:00 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2023-03-03 16:04:00 +0100 |
| commit | 0687c73a12b5157c350de430f62ea8243d813e19 (patch) | |
| tree | 25fcf5ec9ef08a2deecb5dca6572dc10c81f6ca6 /org.eclipse.jgit | |
| parent | f34ae6fe31c6057f217c285d34da4b60ecaaf8af (diff) | |
| parent | ec1dcfe500d90841432666f0cc6aac212be3831f (diff) | |
| download | jgit-0687c73a12b5157c350de430f62ea8243d813e19.tar.gz jgit-0687c73a12b5157c350de430f62ea8243d813e19.zip | |
Merge branch 'stable-6.5'
* stable-6.5:
[errorprone] Suppress [Finally] warnings
Update Orbit to R20230302014618 for 2023-03
Improve test coverage when core.trustPackedRefsStat set to after_open
Prepare 6.5.0-SNAPSHOT builds
JGit v6.5.0.202302281825-rc1
Prepare 6.5.0-SNAPSHOT builds
JGit v6.5.0.202302221508-m3
Change-Id: Ice109c060d14c455262f61aed088111b238d735b
Diffstat (limited to 'org.eclipse.jgit')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java | 1 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java index e0eb126440..f02160e457 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/FetchProcess.java @@ -90,6 +90,7 @@ class FetchProcess { .collect(Collectors.toList()); } + @SuppressWarnings("Finally") void execute(ProgressMonitor monitor, FetchResult result, String initialBranch) throws NotSupportedException, TransportException { diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java index d67fe074e4..ed8f450c53 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/WalkFetchConnection.java @@ -470,6 +470,7 @@ class WalkFetchConnection extends BaseFetchConnection { } } + @SuppressWarnings("Finally") private boolean downloadPackedObject(final ProgressMonitor monitor, final AnyObjectId id) throws TransportException { // Search for the object in a remote pack whose index we have, |