Fixing correct uses of LGitCloneOptionsV140

pharo-vcs · Dec 6, 2022 · b84eddb · b84eddb
1 parent df158c2
commit b84eddb
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 4 deletions.
diff --git a/LibGit-Core.package/LGitCloneOptionsV140.class/instance/clone_init_options.version..st b/LibGit-Core.package/LGitCloneOptionsV140.class/instance/clone_init_options.version..st
@@ -1,5 +1,5 @@
 libgit - calls
 clone_init_options: opts version: version 
 	^ self
-		ffiCall: #(LGitReturnCodeEnum git_clone_init_options(LGitCloneOptionsV120 *opts, LGitOptionsVersionsEnum version))
+		ffiCall: #(LGitReturnCodeEnum git_clone_init_options(LGitCloneOptionsV140 *opts, LGitOptionsVersionsEnum version))
 		options: #(  )
diff --git a/LibGit-Core.package/LGitCloneOptionsV140.class/instance/prim_fetch_opts.st b/LibGit-Core.package/LGitCloneOptionsV140.class/instance/prim_fetch_opts.st
@@ -1,4 +1,4 @@
 libgit-fields
 prim_fetch_opts
 	"This method was automatically generated"
-	^ LGitFetchOptionsV120 fromHandle: (handle referenceStructAt: OFFSET_PRIM_FETCH_OPTS length: LGitFetchOptionsV140 byteSize)
+	^ LGitFetchOptionsV140 fromHandle: (handle referenceStructAt: OFFSET_PRIM_FETCH_OPTS length: LGitFetchOptionsV140 byteSize)
diff --git a/LibGit-Core.package/LGitLibrary.class/instance/pushOptionsStructureClass.st b/LibGit-Core.package/LGitLibrary.class/instance/pushOptionsStructureClass.st
@@ -7,6 +7,6 @@ pushOptionsStructureClass
 	(self ffiLibrary uniqueInstance isVersionLessThan: #(1 2))
 		ifTrue: [ ^ LGitPushOptionsV100 ].
 	(self ffiLibrary uniqueInstance isVersionLessThan: #(1 4))
-		ifTrue: [ ^ LGitPushOptionsV100 ].
+		ifTrue: [ ^ LGitPushOptionsV120 ].
 
 	^ LGitPushOptionsV140
diff --git a/LibGit-Core.package/LGitRemote.class/instance/remote_fetch.refspecs.opts.reflog_message..st b/LibGit-Core.package/LGitRemote.class/instance/remote_fetch.refspecs.opts.reflog_message..st
@@ -5,5 +5,7 @@ remote_fetch: remote refspecs: refspecs opts: opts reflog_message: message
 		^ self remote_fetch_v0251: remote refspecs: refspecs opts: opts reflog_message: message. ].
 	(self ffiLibrary uniqueInstance isVersionLessThan: #(1 2)) ifTrue: [ 
 		^ self remote_fetch_v100: remote refspecs: refspecs opts: opts reflog_message: message ].
+	(self ffiLibrary uniqueInstance isVersionLessThan: #(1 4)) ifTrue: [ 
+		^ self remote_fetch_v120: remote refspecs: refspecs opts: opts reflog_message: message ].
 
-	^ self remote_fetch_v120: remote refspecs: refspecs opts: opts reflog_message: message
+	^ self remote_fetch_v140: remote refspecs: refspecs opts: opts reflog_message: message
diff --git a/...Core.package/LGitRemote.class/instance/remote_fetch_v140.refspecs.opts.reflog_message..st b/...Core.package/LGitRemote.class/instance/remote_fetch_v140.refspecs.opts.reflog_message..st
@@ -0,0 +1,7 @@
+libgit - calls
+remote_fetch_v140: remote refspecs: refspecs opts: opts reflog_message: reflog_message
+
+	^ self
+		ffiCallSafely:
+			#(LGitReturnCodeEnum git_remote_fetch #(self , LGitStringArray * refspecs , LGitFetchOptionsV140 * opts , String reflog_message))
+		options: #(optCoerceNilToNull)