diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-06 00:59:20 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-12-06 01:01:19 +0100 |
| commit | cca2ef12eec44b5b2140761baf13e2a611a654f3 (patch) | |
| tree | 409a88ba0a285b0f7d0903e7817b7f973f5a8789 /org.eclipse.jgit/src/org/eclipse/jgit/transport | |
| parent | 6f8a48134cae23ac380f6704a46ceebac64d7f12 (diff) | |
| parent | b3da1fbab93d63a594b6c743f9a7c98ecc768022 (diff) | |
| download | jgit-cca2ef12eec44b5b2140761baf13e2a611a654f3.tar.gz jgit-cca2ef12eec44b5b2140761baf13e2a611a654f3.zip | |
Merge branch 'stable-7.0' into stable-7.1
* stable-7.0:
FileSnapshot: silence "Not a Directory" exceptions
FileSnapshot: refactor to share error handling
Mark Attribute#getValue as @Nullable
Fix potential NPE in ResolveMerger#getAttributesContentMergeStrategy
Fix NPE in DiffFormatter#getDiffDriver
Pack: ensure packfile is still valid while still recoverable
WindowCache: add bulk purge(), call from bulk sites
UploadPack#implies: add missing @since tag
Disable MergeToolTest#testEmptyToolName
Change-Id: Icb25fed5b703c6a39a64231fd8ca93c1f1a581be
Diffstat (limited to 'org.eclipse.jgit/src/org/eclipse/jgit/transport')
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java index 2270c5e5c5..6013832cac 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/transport/UploadPack.java @@ -158,7 +158,7 @@ public class UploadPack implements Closeable { * @param implied * the implied policy based on its bitmask. * @return true if the policy is implied. - * @since 7.1 + * @since 6.10.1 */ public boolean implies(RequestPolicy implied) { return (bitmask & implied.bitmask) != 0; |