fixes for libgit2 api changes

brianmario · brianmario · commit 4379a54ed0bf · 2015-11-30T16:46:02.000-08:00
diff --git a/ext/rugged/rugged_tree.c b/ext/rugged/rugged_tree.c
@@ -614,15 +614,15 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) {
-			opts->tree_flags |= GIT_MERGE_TREE_FIND_RENAMES;
+			opts->flags |= GIT_MERGE_FIND_RENAMES;
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {
-			opts->tree_flags |= GIT_MERGE_TREE_FAIL_ON_CONFLICT;
+			opts->flags |= GIT_MERGE_FAIL_ON_CONFLICT;
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {
-			opts->tree_flags |= GIT_MERGE_TREE_SKIP_REUC;
+			opts->flags |= GIT_MERGE_SKIP_REUC;
 		}
 	}
 }

Original file line number	Diff line number	Diff line change
`@@ -614,15 +614,15 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)`
`614`	`614`	`}`
`615`	`615`
`616`	`616`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) {`
`617`		`- opts->tree_flags \|= GIT_MERGE_TREE_FIND_RENAMES;`
	`617`	`+ opts->flags \|= GIT_MERGE_FIND_RENAMES;`
`618`	`618`	`}`
`619`	`619`
`620`	`620`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {`
`621`		`- opts->tree_flags \|= GIT_MERGE_TREE_FAIL_ON_CONFLICT;`
	`621`	`+ opts->flags \|= GIT_MERGE_FAIL_ON_CONFLICT;`
`622`	`622`	`}`
`623`	`623`
`624`	`624`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {`
`625`		`- opts->tree_flags \|= GIT_MERGE_TREE_SKIP_REUC;`
	`625`	`+ opts->flags \|= GIT_MERGE_SKIP_REUC;`
`626`	`626`	`}`
`627`	`627`	`}`
`628`	`628`	`}`