tree: Handle skip_reuc flag

vmg · vmg · commit d01a83e13217 · 2015-10-28T11:28:11.000+01:00
diff --git a/ext/rugged/rugged_tree.c b/ext/rugged/rugged_tree.c
@@ -620,6 +620,10 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {
 			opts->tree_flags |= GIT_MERGE_TREE_FAIL_ON_CONFLICT;
 		}
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {
+			opts->tree_flags |= GIT_MERGE_TREE_SKIP_REUC;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -620,6 +620,10 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)`
`620`	`620`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {`
`621`	`621`	`opts->tree_flags \|= GIT_MERGE_TREE_FAIL_ON_CONFLICT;`
`622`	`622`	`}`
	`623`	`+`
	`624`	`+ if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {`
	`625`	`+ opts->tree_flags \|= GIT_MERGE_TREE_SKIP_REUC;`
	`626`	`+ }`
`623`	`627`	`}`
`624`	`628`	`}`
`625`	`629`