Upgrade to libgit2 to 0f9d15493d5d8ad4353dd7beed52c9567334f6e5
diff --git a/blame.go b/blame.go
index c24c934..b07d6bc 100644
--- a/blame.go
+++ b/blame.go
@@ -58,8 +58,8 @@
version: C.GIT_BLAME_OPTIONS_VERSION,
flags: C.uint32_t(opts.Flags),
min_match_characters: C.uint16_t(opts.MinMatchCharacters),
- min_line: C.uint32_t(opts.MinLine),
- max_line: C.uint32_t(opts.MaxLine),
+ min_line: C.size_t(opts.MinLine),
+ max_line: C.size_t(opts.MaxLine),
}
if opts.NewestCommit != nil {
copts.newest_commit = *opts.NewestCommit.toC()
@@ -100,7 +100,7 @@
}
func (blame *Blame) HunkByLine(lineno int) (BlameHunk, error) {
- ptr := C.git_blame_get_hunk_byline(blame.ptr, C.uint32_t(lineno))
+ ptr := C.git_blame_get_hunk_byline(blame.ptr, C.size_t(lineno))
if ptr == nil {
return BlameHunk{}, ErrInvalid
}
diff --git a/diff.go b/diff.go
index de56374..565fcee 100644
--- a/diff.go
+++ b/diff.go
@@ -550,7 +550,7 @@
if opts.NotifyCallback != nil {
C._go_git_setup_diff_notify_callbacks(copts)
- copts.notify_payload = pointerHandles.Track(notifyData)
+ copts.payload = pointerHandles.Track(notifyData)
}
}
return
@@ -562,8 +562,8 @@
freeStrarray(&cpathspec)
C.free(unsafe.Pointer(copts.old_prefix))
C.free(unsafe.Pointer(copts.new_prefix))
- if copts.notify_payload != nil {
- pointerHandles.Untrack(copts.notify_payload)
+ if copts.payload != nil {
+ pointerHandles.Untrack(copts.payload)
}
}
}
diff --git a/merge.go b/merge.go
index 0b0a8f1..9ca50fd 100644
--- a/merge.go
+++ b/merge.go
@@ -84,11 +84,11 @@
// Detect renames that occur between the common ancestor and the "ours"
// side or the common ancestor and the "theirs" side. This will enable
// the ability to merge between a modified and renamed file.
- MergeTreeFindRenames MergeTreeFlag = C.GIT_MERGE_TREE_FIND_RENAMES
+ MergeTreeFindRenames MergeTreeFlag = C.GIT_MERGE_FIND_RENAMES
// If a conflict occurs, exit immediately instead of attempting to
// continue resolving conflicts. The merge operation will fail with
// GIT_EMERGECONFLICT and no index will be returned.
- MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_TREE_FAIL_ON_CONFLICT
+ MergeTreeFailOnConflict MergeTreeFlag = C.GIT_MERGE_FAIL_ON_CONFLICT
)
type MergeOptions struct {
@@ -105,7 +105,7 @@
func mergeOptionsFromC(opts *C.git_merge_options) MergeOptions {
return MergeOptions{
Version: uint(opts.version),
- TreeFlags: MergeTreeFlag(opts.tree_flags),
+ TreeFlags: MergeTreeFlag(opts.flags),
RenameThreshold: uint(opts.rename_threshold),
TargetLimit: uint(opts.target_limit),
FileFavor: MergeFileFavor(opts.file_favor),
@@ -131,7 +131,7 @@
}
return &C.git_merge_options{
version: C.uint(mo.Version),
- tree_flags: C.git_merge_tree_flag_t(mo.TreeFlags),
+ flags: C.git_merge_flag_t(mo.TreeFlags),
rename_threshold: C.uint(mo.RenameThreshold),
target_limit: C.uint(mo.TargetLimit),
file_favor: C.git_merge_file_favor_t(mo.FileFavor),
@@ -374,7 +374,7 @@
c.our_label = C.CString(options.OurLabel)
c.their_label = C.CString(options.TheirLabel)
c.favor = C.git_merge_file_favor_t(options.Favor)
- c.flags = C.uint(options.Flags)
+ c.flags = C.git_merge_file_flag_t(options.Flags)
}
func freeCMergeFileOptions(c *C.git_merge_file_options) {
diff --git a/vendor/libgit2 b/vendor/libgit2
index 821131f..0f9d154 160000
--- a/vendor/libgit2
+++ b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 821131fdaee74526d84aaf1c6ceddc2139c551df
+Subproject commit 0f9d15493d5d8ad4353dd7beed52c9567334f6e5
