Merge pull request #549 from libgit2/brianmario/recursive-merge

Vicent Marti · Vicent Marti · commit 88e2ceb468c0 · 2015-12-01T10:04:04.000+01:00
Add support for new GIT_MERGE_NO_RECURSIVE option for merges
diff --git a/ext/rugged/rugged_tree.c b/ext/rugged/rugged_tree.c
@@ -614,15 +614,19 @@ 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;
+		}
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("no_recursive")))) {
+			opts->flags |= GIT_MERGE_NO_RECURSIVE;
 		}
 	}
 }
diff --git a/vendor/libgit2 b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 1318ec91a142d442718dc8430da4499b7739a088
+Subproject commit a589f22a9441523327e4c987c5b5f5f857472067

Original file line number	Diff line number	Diff line change
`@@ -614,15 +614,19 @@ 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`	`+ }`
	`627`	`+`
	`628`	`+ if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("no_recursive")))) {`
	`629`	`+ opts->flags \|= GIT_MERGE_NO_RECURSIVE;`
`626`	`630`	`}`
`627`	`631`	`}`
`628`	`632`	`}`