diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:45:20 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:45:20 +0100 |
| commit | 11bb889d0b5d386d04751d7380c6be082ffc9112 (patch) | |
| tree | 9ebf3d9255fe4cfbe61bc89e02046f0f6c9aa8f0 | |
| parent | 01dde5c76774ad95e584e335182ba7333f2e7f95 (diff) | |
| parent | 1b4d733e5b513ce083466d27f015d252bb679f99 (diff) | |
| download | jgit-11bb889d0b5d386d04751d7380c6be082ffc9112.tar.gz jgit-11bb889d0b5d386d04751d7380c6be082ffc9112.zip | |
Merge branch 'stable-6.6' into stable-6.7
* stable-6.6:
Silence API warnings
Make sure ref to prune is in packed refs
Checkout: better directory handling
Change-Id: Id3b01c7a583d45b4e67e3f993006a5646f77a41d
| -rw-r--r-- | org.eclipse.jgit/.settings/.api_filters | 101 | ||||
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java | 2 |
2 files changed, 102 insertions, 1 deletions
diff --git a/org.eclipse.jgit/.settings/.api_filters b/org.eclipse.jgit/.settings/.api_filters new file mode 100644 index 0000000000..a6aff1bf85 --- /dev/null +++ b/org.eclipse.jgit/.settings/.api_filters @@ -0,0 +1,101 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<component id="org.eclipse.jgit" version="2"> + <resource path="src/org/eclipse/jgit/api/GarbageCollectCommand.java" type="org.eclipse.jgit.api.GarbageCollectCommand"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="setPackKeptObjects(boolean)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/dircache/Checkout.java" type="org.eclipse.jgit.dircache.Checkout"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="6.6.1"/> + <message_argument value="org.eclipse.jgit.dircache.Checkout"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/errors/PackMismatchException.java" type="org.eclipse.jgit.errors.PackMismatchException"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.9.1"/> + <message_argument value="isPermanent()"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.9.1"/> + <message_argument value="setPermanent(boolean)"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lib/ConfigConstants.java" type="org.eclipse.jgit.lib.ConfigConstants"> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.2"/> + <message_argument value="CONFIG_KEY_SKIPHASH"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="CONFIG_KEY_PACK_KEPT_OBJECTS"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="CONFIG_REPACK_SECTION"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/lib/FileModeCache.java" type="org.eclipse.jgit.lib.FileModeCache"> + <filter id="1109393411"> + <message_arguments> + <message_argument value="6.6.1"/> + <message_argument value="org.eclipse.jgit.lib.FileModeCache"/> + </message_arguments> + </filter> + </resource> + <resource path="src/org/eclipse/jgit/revwalk/RevCommit.java" type="org.eclipse.jgit.revwalk.RevCommit"> + <filter id="1193279491"> + <message_arguments> + <message_argument value="6.5.1"/> + <message_argument value="buffer"/> + </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_argument value="org.eclipse.jgit.storage.pack.PackConfig"/> + <message_argument value="DEFAULT_PACK_KEPT_OBJECTS"/> + </message_arguments> + </filter> + <filter id="336658481"> + <message_arguments> + <message_argument value="org.eclipse.jgit.storage.pack.PackConfig"/> + <message_argument value="DEFAULT_WRITE_REVERSE_INDEX"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="DEFAULT_PACK_KEPT_OBJECTS"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="isPackKeptObjects()"/> + </message_arguments> + </filter> + <filter id="1142947843"> + <message_arguments> + <message_argument value="5.13.3"/> + <message_argument value="setPackKeptObjects(boolean)"/> + </message_arguments> + </filter> + </resource> +</component> diff --git 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 index 912c89bc8b..8bf6c672e6 100644 --- 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 @@ -800,7 +800,7 @@ public class RefDirectory extends RefDatabase { } Ref packedRef = newPacked.get(refName); ObjectId clr_oid = currentLooseRef.getObjectId(); - if (clr_oid != null + if (clr_oid != null && packedRef != null && clr_oid.equals(packedRef.getObjectId())) { RefList<LooseRef> curLoose, newLoose; do { |