Skip to content

Commit 3d71468

Browse files
authored
Bump jgit to version 7.1.0 (#5587)
(otherwise the tests fail if you have git config setting `gpg.format=ssh`) Signed-off-by: Tom Sellman <tom.sellman@seqera.io>
1 parent 40670f7 commit 3d71468

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

modules/nextflow/build.gradle

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ dependencies {
3939
api "com.beust:jcommander:1.35"
4040
api("com.esotericsoftware.kryo:kryo:2.24.0") { exclude group: 'com.esotericsoftware.minlog', module: 'minlog' }
4141
api('org.iq80.leveldb:leveldb:0.12')
42-
api('org.eclipse.jgit:org.eclipse.jgit:6.10.0.202406032230-r')
42+
api('org.eclipse.jgit:org.eclipse.jgit:7.1.0.202411261347-r')
4343
api ('javax.activation:activation:1.1.1')
4444
api ('javax.mail:mail:1.4.7')
4545
api ('org.yaml:snakeyaml:2.2')

modules/nextflow/src/main/groovy/nextflow/scm/AssetManager.groovy

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ class AssetManager {
833833

834834
protected Map refToMap(Ref ref, Map<String,Ref> remote) {
835835
final entry = new HashMap(2)
836-
final peel = git.getRepository().peel(ref)
836+
final peel = git.getRepository().getRefDatabase().peel(ref)
837837
final objId = peel.getPeeledObjectId() ?: peel.getObjectId()
838838
// the branch or tag name
839839
entry.name = shortenRefName(ref.name)
@@ -867,7 +867,7 @@ class AssetManager {
867867
result << (name == current ? '*' : ' ')
868868

869869
if( level ) {
870-
def peel = git.getRepository().peel(ref)
870+
def peel = git.getRepository().getRefDatabase().peel(ref)
871871
def obj = peel.getPeeledObjectId() ?: peel.getObjectId()
872872
result << ' '
873873
result << formatObjectId(obj, level == 1)

0 commit comments

Comments
 (0)