diff options
| author | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:47:13 +0100 |
|---|---|---|
| committer | Matthias Sohn <matthias.sohn@sap.com> | 2024-01-10 23:47:13 +0100 |
| commit | 2a3bbae47a3358d97f3a5d61178c2448730c40db (patch) | |
| tree | e185ce49c93d66cf6ed2ce5d21fbcfea7dcca374 | |
| parent | 796fb2e5c71a00b0335d33326ad55e8759486f4f (diff) | |
| parent | 11bb889d0b5d386d04751d7380c6be082ffc9112 (diff) | |
| download | jgit-2a3bbae47a3358d97f3a5d61178c2448730c40db.tar.gz jgit-2a3bbae47a3358d97f3a5d61178c2448730c40db.zip | |
Merge branch 'stable-6.7' into stable-6.8
* stable-6.7:
Silence API warnings
Make sure ref to prune is in packed refs
Checkout: better directory handling
Change-Id: Ie8c433e14d025055aa6ce674d6d1220fe1354785
| -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 { |