Merge pull request #542 from libgit2/vmg/fast-merges

Vicent Marti · Vicent Marti · commit 7d86086c8f8f · 2015-10-28T11:42:27.000+01:00
Experimental fast merges branch
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;
+		}
 	}
 }
 
diff --git a/lib/rugged/version.rb b/lib/rugged/version.rb
@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.24.0b4'
+  Version = VERSION = '0.24.0b5'
 end
diff --git a/vendor/libgit2 b/vendor/libgit2
@@ -1 +1 @@
-Subproject commit 7c0c21c3f35dc7b5667a9c16d4e3a2ddf1901f30
+Subproject commit d3416dfe29e59ba7de7bf49e060bf13c07960344

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`