refactor: Use undeprecated options init (#656)

suhaibmujahid · web-flow · commit 5b6ce70b8997 · 2020-10-22T06:18:11.000-07:00
This PR move form linking against the deprecated `init_options` functions to the renamed `options_init` functions. For more context see libgit2/libgit2@0b5ba0d and libgit2/libgit2@c6184f0.
diff --git a/blame.go b/blame.go
@@ -23,7 +23,7 @@ func DefaultBlameOptions() (BlameOptions, error) {
 	defer runtime.UnlockOSThread()
 
 	opts := C.git_blame_options{}
-	ecode := C.git_blame_init_options(&opts, C.GIT_BLAME_OPTIONS_VERSION)
+	ecode := C.git_blame_options_init(&opts, C.GIT_BLAME_OPTIONS_VERSION)
 	if ecode < 0 {
 		return BlameOptions{}, MakeGitError(ecode)
 	}
diff --git a/checkout.go b/checkout.go
@@ -134,7 +134,7 @@ func populateCheckoutOpts(ptr *C.git_checkout_options, opts *CheckoutOpts) *C.gi
 		return nil
 	}
 
-	C.git_checkout_init_options(ptr, 1)
+	C.git_checkout_options_init(ptr, 1)
 	ptr.checkout_strategy = C.uint(opts.Strategy)
 	ptr.disable_filters = cbool(opts.DisableFilters)
 	ptr.dir_mode = C.uint(opts.DirMode.Perm())
diff --git a/cherrypick.go b/cherrypick.go
@@ -50,7 +50,7 @@ func DefaultCherrypickOptions() (CherrypickOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_cherrypick_init_options(&c, C.GIT_CHERRYPICK_OPTIONS_VERSION)
+	ecode := C.git_cherrypick_options_init(&c, C.GIT_CHERRYPICK_OPTIONS_VERSION)
 	if ecode < 0 {
 		return CherrypickOptions{}, MakeGitError(ecode)
 	}
diff --git a/clone.go b/clone.go
@@ -77,7 +77,7 @@ func remoteCreateCallback(cremote unsafe.Pointer, crepo unsafe.Pointer, cname, c
 }
 
 func populateCloneOptions(ptr *C.git_clone_options, opts *CloneOptions) {
-	C.git_clone_init_options(ptr, C.GIT_CLONE_OPTIONS_VERSION)
+	C.git_clone_options_init(ptr, C.GIT_CLONE_OPTIONS_VERSION)
 
 	if opts == nil {
 		return
diff --git a/describe.go b/describe.go
@@ -43,7 +43,7 @@ func DefaultDescribeOptions() (DescribeOptions, error) {
 	defer runtime.UnlockOSThread()
 
 	opts := C.git_describe_options{}
-	ecode := C.git_describe_init_options(&opts, C.GIT_DESCRIBE_OPTIONS_VERSION)
+	ecode := C.git_describe_options_init(&opts, C.GIT_DESCRIBE_OPTIONS_VERSION)
 	if ecode < 0 {
 		return DescribeOptions{}, MakeGitError(ecode)
 	}
@@ -77,7 +77,7 @@ func DefaultDescribeFormatOptions() (DescribeFormatOptions, error) {
 	defer runtime.UnlockOSThread()
 
 	opts := C.git_describe_format_options{}
-	ecode := C.git_describe_init_format_options(&opts, C.GIT_DESCRIBE_FORMAT_OPTIONS_VERSION)
+	ecode := C.git_describe_format_options_init(&opts, C.GIT_DESCRIBE_FORMAT_OPTIONS_VERSION)
 	if ecode < 0 {
 		return DescribeFormatOptions{}, MakeGitError(ecode)
 	}
diff --git a/diff.go b/diff.go
@@ -512,7 +512,7 @@ func DefaultDiffOptions() (DiffOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_diff_init_options(&opts, C.GIT_DIFF_OPTIONS_VERSION)
+	ecode := C.git_diff_options_init(&opts, C.GIT_DIFF_OPTIONS_VERSION)
 	if ecode < 0 {
 		return DiffOptions{}, MakeGitError(ecode)
 	}
@@ -567,7 +567,7 @@ func DefaultDiffFindOptions() (DiffFindOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_diff_find_init_options(&opts, C.GIT_DIFF_FIND_OPTIONS_VERSION)
+	ecode := C.git_diff_find_options_init(&opts, C.GIT_DIFF_FIND_OPTIONS_VERSION)
 	if ecode < 0 {
 		return DiffFindOptions{}, MakeGitError(ecode)
 	}
diff --git 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)
 		}
diff --git a/rebase.go b/rebase.go
@@ -140,7 +140,7 @@ func DefaultRebaseOptions() (RebaseOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_rebase_init_options(&opts, C.GIT_REBASE_OPTIONS_VERSION)
+	ecode := C.git_rebase_options_init(&opts, C.GIT_REBASE_OPTIONS_VERSION)
 	if ecode < 0 {
 		return RebaseOptions{}, MakeGitError(ecode)
 	}
diff --git a/remote.go b/remote.go
@@ -361,7 +361,7 @@ func pushUpdateReferenceCallback(refname, status *C.char, data unsafe.Pointer) i
 }
 
 func populateProxyOptions(ptr *C.git_proxy_options, opts *ProxyOptions) {
-	C.git_proxy_init_options(ptr, C.GIT_PROXY_OPTIONS_VERSION)
+	C.git_proxy_options_init(ptr, C.GIT_PROXY_OPTIONS_VERSION)
 	if opts == nil {
 		return
 	}
@@ -685,7 +685,7 @@ func (o *Remote) RefspecCount() uint {
 }
 
 func populateFetchOptions(options *C.git_fetch_options, opts *FetchOptions) {
-	C.git_fetch_init_options(options, C.GIT_FETCH_OPTIONS_VERSION)
+	C.git_fetch_options_init(options, C.GIT_FETCH_OPTIONS_VERSION)
 	if opts == nil {
 		return
 	}
@@ -701,7 +701,7 @@ func populateFetchOptions(options *C.git_fetch_options, opts *FetchOptions) {
 }
 
 func populatePushOptions(options *C.git_push_options, opts *PushOptions) {
-	C.git_push_init_options(options, C.GIT_PUSH_OPTIONS_VERSION)
+	C.git_push_options_init(options, C.GIT_PUSH_OPTIONS_VERSION)
 	if opts == nil {
 		return
 	}
diff --git a/revert.go b/revert.go
@@ -43,7 +43,7 @@ func DefaultRevertOptions() (RevertOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_revert_init_options(&opts, C.GIT_REVERT_OPTIONS_VERSION)
+	ecode := C.git_revert_options_init(&opts, C.GIT_REVERT_OPTIONS_VERSION)
 	if ecode < 0 {
 		return RevertOptions{}, MakeGitError(ecode)
 	}
diff --git a/stash.go b/stash.go
@@ -151,7 +151,7 @@ func DefaultStashApplyOptions() (StashApplyOptions, error) {
 	runtime.LockOSThread()
 	defer runtime.UnlockOSThread()
 
-	ecode := C.git_stash_apply_init_options(&optsC, C.GIT_STASH_APPLY_OPTIONS_VERSION)
+	ecode := C.git_stash_apply_options_init(&optsC, C.GIT_STASH_APPLY_OPTIONS_VERSION)
 	if ecode < 0 {
 		return StashApplyOptions{}, MakeGitError(ecode)
 	}
diff --git a/status.go b/status.go
@@ -159,7 +159,7 @@ func (v *Repository) StatusList(opts *StatusOptions) (*StatusList, error) {
 		}
 	} else {
 		copts = &C.git_status_options{}
-		ret := C.git_status_init_options(copts, C.GIT_STATUS_OPTIONS_VERSION)
+		ret := C.git_status_options_init(copts, C.GIT_STATUS_OPTIONS_VERSION)
 		if ret < 0 {
 			return nil, MakeGitError(ret)
 		}
diff --git a/submodule.go b/submodule.go
@@ -360,7 +360,7 @@ func (sub *Submodule) Update(init bool, opts *SubmoduleUpdateOptions) error {
 }
 
 func populateSubmoduleUpdateOptions(ptr *C.git_submodule_update_options, opts *SubmoduleUpdateOptions) error {
-	C.git_submodule_update_init_options(ptr, C.GIT_SUBMODULE_UPDATE_OPTIONS_VERSION)
+	C.git_submodule_update_options_init(ptr, C.GIT_SUBMODULE_UPDATE_OPTIONS_VERSION)
 
 	if opts == nil {
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ func DefaultBlameOptions() (BlameOptions, error) {`
`23`	`23`	`defer runtime.UnlockOSThread()`
`24`	`24`
`25`	`25`	`opts := C.git_blame_options{}`
`26`		`- ecode := C.git_blame_init_options(&opts, C.GIT_BLAME_OPTIONS_VERSION)`
	`26`	`+ ecode := C.git_blame_options_init(&opts, C.GIT_BLAME_OPTIONS_VERSION)`
`27`	`27`	`if ecode < 0 {`
`28`	`28`	`return BlameOptions{}, MakeGitError(ecode)`
`29`	`29`	`}`
Original file line number	Diff line number	Diff line change
`@@ -134,7 +134,7 @@ func populateCheckoutOpts(ptr C.git_checkout_options, opts CheckoutOpts) *C.gi`
`134`	`134`	`return nil`
`135`	`135`	`}`
`136`	`136`
`137`		`- C.git_checkout_init_options(ptr, 1)`
	`137`	`+ C.git_checkout_options_init(ptr, 1)`
`138`	`138`	`ptr.checkout_strategy = C.uint(opts.Strategy)`
`139`	`139`	`ptr.disable_filters = cbool(opts.DisableFilters)`
`140`	`140`	`ptr.dir_mode = C.uint(opts.DirMode.Perm())`
Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@ func DefaultCherrypickOptions() (CherrypickOptions, error) {`
`50`	`50`	`runtime.LockOSThread()`
`51`	`51`	`defer runtime.UnlockOSThread()`
`52`	`52`
`53`		`- ecode := C.git_cherrypick_init_options(&c, C.GIT_CHERRYPICK_OPTIONS_VERSION)`
	`53`	`+ ecode := C.git_cherrypick_options_init(&c, C.GIT_CHERRYPICK_OPTIONS_VERSION)`
`54`	`54`	`if ecode < 0 {`
`55`	`55`	`return CherrypickOptions{}, MakeGitError(ecode)`
`56`	`56`	`}`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ func remoteCreateCallback(cremote unsafe.Pointer, crepo unsafe.Pointer, cname, c`
`77`	`77`	`}`
`78`	`78`
`79`	`79`	`func populateCloneOptions(ptr C.git_clone_options, opts CloneOptions) {`
`80`		`- C.git_clone_init_options(ptr, C.GIT_CLONE_OPTIONS_VERSION)`
	`80`	`+ C.git_clone_options_init(ptr, C.GIT_CLONE_OPTIONS_VERSION)`
`81`	`81`
`82`	`82`	`if opts == nil {`
`83`	`83`	`return`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func DefaultRebaseOptions() (RebaseOptions, error) {`
`140`	`140`	`runtime.LockOSThread()`
`141`	`141`	`defer runtime.UnlockOSThread()`
`142`	`142`
`143`		`- ecode := C.git_rebase_init_options(&opts, C.GIT_REBASE_OPTIONS_VERSION)`
	`143`	`+ ecode := C.git_rebase_options_init(&opts, C.GIT_REBASE_OPTIONS_VERSION)`
`144`	`144`	`if ecode < 0 {`
`145`	`145`	`return RebaseOptions{}, MakeGitError(ecode)`
`146`	`146`	`}`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ func pushUpdateReferenceCallback(refname, status *C.char, data unsafe.Pointer) i`
`361`	`361`	`}`
`362`	`362`
`363`	`363`	`func populateProxyOptions(ptr C.git_proxy_options, opts ProxyOptions) {`
`364`		`- C.git_proxy_init_options(ptr, C.GIT_PROXY_OPTIONS_VERSION)`
	`364`	`+ C.git_proxy_options_init(ptr, C.GIT_PROXY_OPTIONS_VERSION)`
`365`	`365`	`if opts == nil {`
`366`	`366`	`return`
`367`	`367`	`}`
`@@ -685,7 +685,7 @@ func (o *Remote) RefspecCount() uint {`
`685`	`685`	`}`
`686`	`686`
`687`	`687`	`func populateFetchOptions(options C.git_fetch_options, opts FetchOptions) {`
`688`		`- C.git_fetch_init_options(options, C.GIT_FETCH_OPTIONS_VERSION)`
	`688`	`+ C.git_fetch_options_init(options, C.GIT_FETCH_OPTIONS_VERSION)`
`689`	`689`	`if opts == nil {`
`690`	`690`	`return`
`691`	`691`	`}`
`@@ -701,7 +701,7 @@ func populateFetchOptions(options C.git_fetch_options, opts FetchOptions) {`
`701`	`701`	`}`
`702`	`702`
`703`	`703`	`func populatePushOptions(options C.git_push_options, opts PushOptions) {`
`704`		`- C.git_push_init_options(options, C.GIT_PUSH_OPTIONS_VERSION)`
	`704`	`+ C.git_push_options_init(options, C.GIT_PUSH_OPTIONS_VERSION)`
`705`	`705`	`if opts == nil {`
`706`	`706`	`return`
`707`	`707`	`}`
Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ func DefaultRevertOptions() (RevertOptions, error) {`
`43`	`43`	`runtime.LockOSThread()`
`44`	`44`	`defer runtime.UnlockOSThread()`
`45`	`45`
`46`		`- ecode := C.git_revert_init_options(&opts, C.GIT_REVERT_OPTIONS_VERSION)`
	`46`	`+ ecode := C.git_revert_options_init(&opts, C.GIT_REVERT_OPTIONS_VERSION)`
`47`	`47`	`if ecode < 0 {`
`48`	`48`	`return RevertOptions{}, MakeGitError(ecode)`
`49`	`49`	`}`