diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:58:02 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:58:02 +0100 |
| commit | d16dba3afc2a755f752558557572332a4261c79a (patch) | |
| tree | 41e4c44b0124c5f42170a704b985897bf0ede5d2 | |
| parent | ef53cb8a9f15d5548bfbb3d4da479104c081e747 (diff) | |
| parent | 2a3bbae47a3358d97f3a5d61178c2448730c40db (diff) | |
| download | jgit-d16dba3afc2a755f752558557572332a4261c79a.tar.gz jgit-d16dba3afc2a755f752558557572332a4261c79a.zip | |
Merge branch 'stable-6.8'
* stable-6.8:
Silence API warnings
Make sure ref to prune is in packed refs
Checkout: better directory handling
Change-Id: Ief6e4d6cd3fcea327f28c32643b8323f5d0c6936
| -rw-r--r-- | org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/RefDirectory.java | 2 |
1 files changed, 1 insertions, 1 deletions
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 a00b80bb7d..a41c7a70e6 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 @@ -811,7 +811,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 { |