support new GIT_MERGE_NO_RECURSIVE option for merges

brianmario · brianmario · commit cd76fc556ad5 · 2015-11-30T16:46:13.000-08:00
diff --git a/ext/rugged/rugged_tree.c b/ext/rugged/rugged_tree.c
@@ -624,6 +624,10 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {
 			opts->flags |= GIT_MERGE_SKIP_REUC;
 		}
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("no_recursive")))) {
+			opts->flags |= GIT_MERGE_NO_RECURSIVE;
+		}
 	}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -624,6 +624,10 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)`
`624`	`624`	`if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("skip_reuc")))) {`
`625`	`625`	`opts->flags \|= GIT_MERGE_SKIP_REUC;`
`626`	`626`	`}`
	`627`	`+`
	`628`	`+ if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("no_recursive")))) {`
	`629`	`+ opts->flags \|= GIT_MERGE_NO_RECURSIVE;`
	`630`	`+ }`
`627`	`631`	`}`
`628`	`632`	`}`
`629`	`633`