Merge branch 'master' into next

* master:
  ResolveMerger: Fix the issue with binary modify-modify conflicts
  Explain why RacyGitTests may be flaky in some environments
  PackBitmapIndexBuilder.StoredEntry: add getter for objectId
  PackBitmapIndex: clarify naming of getObject inputs
  Revert "[releng] Bump Bouncy Castle to 1.78"
  [releng] Bump Bouncy Castle to 1.78
  MergeAlgorithm: Fix diff3 conflict hunk computation
  [gpg] Remove obsolete import-package
  [gpg] Correct finding public keys from pubring.gpg
  [gpg] Fix reading ed25519 GPG keys
  PackBitmapIndexBuilder: make StoredEntry constructor public
  PackBitmapIndexBuilder: allow repeated call of getCompressedBitmaps()
  DfsPackFile: Make the loader classes used to construct bitmaps public.
  DfsPackFile: make public the constructor with bitmap loader
  PackWriter: writeBitmapIndex takes bitmap index writer
  Add more tests on rewriting parents in a RevWalk
  PackBitmapIndex: convert from class to interface
  Cache refreshed loose ref dirs in SnapshottingRefDirectory
  DfsGarbageCollectorTest: add test for bitmap index creation
  PackBitmapIndex: hide packChecksum behind getter
  TreeRevFilter: correct changedPathFilter usage for multi-paths inclusion
  PathFilterGroup: implement getPathsBestEffort()
  CleanupService: preload JgitText if not running in OSGi
  DfsPackFile: get commitGraph.readChangePaths from repo config
  CommitGraphLoader: receive readChangedPaths as parameter
  Add pull request template discouraging usage of pull requests
  Update CONTRIBUTING.md to point to GitHub issues
  FS_POSIX.runInShell(): on MacOS use a login shell
  [ssh] Implement the "Ciphers" SSH config
  ShutdownHook: run on bundle deactivation if in OSGi
  [diffmergetool] Fix running command on Cygwin
  [releng] Bump japicmp base version to 6.9.0.202403050737-r
  DfsBlockCache: move cache table specific implementations to a new class
  Prepare 6.10.0-SNAPSHOT builds
  Prepare 6.9.1-SNAPSHOT builds
  JGit v6.9.0.202403050737-r
  JGit v6.9.0.202403050045-r
  Prepare 6.9.0-SNAPSHOT builds
  Introduce core.trustLooseRefStat config
  JGit v6.9.0.202402281855-rc1
  Update SECURITY.md
  DfsObjDatabase: Let object database instantiate DfsPackFiles
  DfsPackFile: Abstract the bitmap loading to support other backends
  Remove unused API problem filters
  Support public key in IdentityFile
  Revert "StartGenerator: Fix parent rewrite with non-default RevFilter"
  Prepare 6.9.0-SNAPSHOT builds
  JGit v6.9.0.202402211805-m3
  DfsReader#getObjectSize: use size index if possible

Change-Id: Ibdde5be8c5c2b3938aeaa4f278020cadcaad36a3

3 files changed, 18 insertions, 1 deletions

diff --git a/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.asc b/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.asc
new file mode 100644
index 0000000000..ee8207ec41
--- /dev/null
+++ b/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.asc
@@ -0,0 +1,9 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+
+mDMEZet5vRYJKwYBBAHaRw8BAQdA1lUwXTD4ia1i4+ckhPr0O0a9aQAarg6U8prB
+6H85XJG0GFRlc3RlciA8dGVzdGVyQHRlc3QuY29tPoiQBBMWCgA4FiEEwLQ/UWQ8
+ydO7u8ea7hn0dWq7fbwFAmXreb0CGwEFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AA
+CgkQ7hn0dWq7fbxhPwEA3a0COi4sV7Uxd91H9P5DXJA2XzYtyvYsxZJEICFZPo8B
+AO6fF9Ii5ATO5USSMf6bNCevcBlDFBNXIO+pwjemrBYJ
+=LYEV
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.key b/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.key
new file mode 100644
index 0000000000..03ed01cb0b
--- /dev/null
+++ b/org.eclipse.jgit.gpg.bc.test/tst-rsrc/org/eclipse/jgit/gpg/bc/internal/keys/62D43D7F117F7A5E4998ECB6617EE9942D069C14.key
@@ -0,0 +1,7 @@
+Key: (protected-private-key (ecc (curve Ed25519)(flags eddsa)(q
+  #40D655305D30F889AD62E3E72484FAF43B46BD69001AAE0E94F29AC1E87F395C91#)
+ (protected openpgp-s2k3-ocb-aes ((sha1 #EBA45EE5104E7ED6#
+  "24672256")#36CB86BDBEA4947789F555B6#)#2D3CBB52F66DED8E0E7B0A1FEE9732
+ 4FC1624B32069CD1ED507877E26B3099E62C2AC615DA7E8DAAD335EC613AD2CD9B89C4
+ D1BCDEADEA3C67785428#)(protected-at "20240308T204911")))
+Created: 20240308T204901
diff --git a/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java b/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java
index 5e5e303319..fed06103b6 100644
--- a/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java
+++ b/org.eclipse.jgit.gpg.bc.test/tst/org/eclipse/jgit/gpg/bc/internal/keys/SecretKeysTest.java
@@ -97,6 +97,7 @@ public class SecretKeysTest {
 				new TestData("2FB05DBB70FC07CB84C13431F640CA6CEA1DBF8A", false, true),
 				new TestData("66CCECEC2AB46A9735B10FEC54EDF9FD0F77BAF9", true, true),
 				new TestData("F727FAB884DA3BD402B6E0F5472E108D21033124", true, true),
+				new TestData("62D43D7F117F7A5E4998ECB6617EE9942D069C14", true, true),
 				new TestData("faked", false, true) };
 	}
 
@@ -152,7 +153,7 @@ public class SecretKeysTest {
 					assertNotNull(secretKey);
 				} catch (PGPException e) {
 					// Currently we may not be able to load OCB-encrypted keys.
-					assertTrue(e.getMessage().contains("OCB"));
+					assertTrue(e.toString(), e.getMessage().contains("OCB"));
 					assertTrue(data.encrypted);
 					assertFalse(ocbAvailable());
 				}