From 5b6ce70b8997254ce48f8c24ba4198080e646fdd Mon Sep 17 00:00:00 2001 From: Suhaib Mujahid Date: Thu, 22 Oct 2020 09:18:11 -0400 Subject: refactor: Use undeprecated options init (#656) This PR move form linking against the deprecated `init_options` functions to the renamed `options_init` functions. For more context see libgit2/libgit2@0b5ba0d744e69da5dc8c08d167c83dd87ed83af2 and libgit2/libgit2@c6184f0c4b209e462bf3f42ab20df2d13d8ee918. --- merge.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'merge.go') diff --git a/merge.go b/merge.go index 06bd06d..4c3a092 100644 --- a/merge.go +++ b/merge.go @@ -165,7 +165,7 @@ func DefaultMergeOptions() (MergeOptions, error) { runtime.LockOSThread() defer runtime.UnlockOSThread() - ecode := C.git_merge_init_options(&opts, C.GIT_MERGE_OPTIONS_VERSION) + ecode := C.git_merge_options_init(&opts, C.GIT_MERGE_OPTIONS_VERSION) if ecode < 0 { return MergeOptions{}, MakeGitError(ecode) } @@ -477,7 +477,7 @@ func MergeFile(ancestor MergeFileInput, ours MergeFileInput, theirs MergeFileInp var copts *C.git_merge_file_options if options != nil { copts = &C.git_merge_file_options{} - ecode := C.git_merge_file_init_options(copts, C.GIT_MERGE_FILE_OPTIONS_VERSION) + ecode := C.git_merge_file_options_init(copts, C.GIT_MERGE_FILE_OPTIONS_VERSION) if ecode < 0 { return nil, MakeGitError(ecode) } -- cgit v1.2.3