Hardcode version in apply options which should never change
This commit is contained in:
parent
6dc7641069
commit
633f7639db
4
diff.go
4
diff.go
|
@ -856,7 +856,6 @@ type ApplyDeltaCallback func(*DiffDelta) (apply bool, err error)
|
|||
// If these functions return an error, abort the apply process immediately.
|
||||
// If the first return value is true, the delta/hunk will be applied. If it is false, the delta/hunk will not be applied. In either case, the rest of the apply process will continue.
|
||||
type ApplyOptions struct {
|
||||
Version uint
|
||||
ApplyHunkCallback ApplyHunkCallback
|
||||
ApplyDeltaCallback ApplyDeltaCallback
|
||||
Flags uint
|
||||
|
@ -934,7 +933,7 @@ func (a *ApplyOptions) toC() *C.git_apply_options {
|
|||
}
|
||||
|
||||
opts := &C.git_apply_options{
|
||||
version: C.uint(a.Version),
|
||||
version: C.GIT_APPLY_OPTIONS_VERSION,
|
||||
flags: C.uint(a.Flags),
|
||||
}
|
||||
|
||||
|
@ -948,7 +947,6 @@ func (a *ApplyOptions) toC() *C.git_apply_options {
|
|||
|
||||
func applyOptionsFromC(opts *C.git_apply_options) *ApplyOptions {
|
||||
return &ApplyOptions{
|
||||
Version: uint(opts.version),
|
||||
Flags: uint(opts.flags),
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue