jcarr
/
git2go
1
0
Fork 0
Code Issues 52 Pull Requests 31 Packages Projects Releases Wiki Activity

merge: Expose recursion limit merge option #642

Merged
pks-t merged 1 commits from pks-merge-recursion-limit into master 2020-09-18 07:43:57 -05:00
Conversation 0 Commits 1 Files Changed 1 +3
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
merge.go
View File

@ -142,6 +142,7 @@ type MergeOptions struct {
RenameThreshold uint RenameThreshold uint
TargetLimit uint TargetLimit uint
RecursionLimit uint
FileFavor MergeFileFavor FileFavor MergeFileFavor
//TODO: Diff similarity metric //TODO: Diff similarity metric
@ -153,6 +154,7 @@ func mergeOptionsFromC(opts *C.git_merge_options) MergeOptions {
TreeFlags: MergeTreeFlag(opts.flags), TreeFlags: MergeTreeFlag(opts.flags),
RenameThreshold: uint(opts.rename_threshold), RenameThreshold: uint(opts.rename_threshold),
TargetLimit: uint(opts.target_limit), TargetLimit: uint(opts.target_limit),
RecursionLimit: uint(opts.recursion_limit),
FileFavor: MergeFileFavor(opts.file_favor), FileFavor: MergeFileFavor(opts.file_favor),
} }
} }
@ -179,6 +181,7 @@ func (mo *MergeOptions) toC() *C.git_merge_options {
flags: C.uint32_t(mo.TreeFlags), flags: C.uint32_t(mo.TreeFlags),
rename_threshold: C.uint(mo.RenameThreshold), rename_threshold: C.uint(mo.RenameThreshold),
target_limit: C.uint(mo.TargetLimit), target_limit: C.uint(mo.TargetLimit),
recursion_limit: C.uint(mo.RecursionLimit),
file_favor: C.git_merge_file_favor_t(mo.FileFavor), file_favor: C.git_merge_file_favor_t(mo.FileFavor),
} }
} }