Merge pull request #540 from libgit2/vmg/fast-merge

Fail merges fast

Author: Vicent Marti

ext/rugged/rugged_repo.c

@@ -846,6 +846,7 @@ static VALUE rb_git_repo_merge_commits(int argc, VALUE *argv, VALUE self)
 	git_index *index;
 	git_repository *repo;
 	git_merge_options opts = GIT_MERGE_OPTIONS_INIT;
+	int error;
 
 	rb_scan_args(argc, argv, "20:", &rb_our_commit, &rb_their_commit, &rb_options);
 
@@ -874,7 +875,11 @@ static VALUE rb_git_repo_merge_commits(int argc, VALUE *argv, VALUE self)
 	Data_Get_Struct(rb_our_commit, git_commit, our_commit);
 	Data_Get_Struct(rb_their_commit, git_commit, their_commit);
 
-	rugged_exception_check(git_merge_commits(&index, repo, our_commit, their_commit, &opts));
+	error = git_merge_commits(&index, repo, our_commit, their_commit, &opts);
+	if (error == GIT_EMERGECONFLICT)
+		return Qnil;
+
+	rugged_exception_check(error);
 
 	return rugged_index_new(rb_cRuggedIndex, self, index);
 }

ext/rugged/rugged_tree.c

@@ -616,6 +616,10 @@ 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;
 		}
+
+		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {
+			opts->tree_flags |= GIT_MERGE_TREE_FAIL_ON_CONFLICT;
+		}
 	}
 }
 
@@ -682,6 +686,9 @@ static VALUE rb_git_tree_merge(int argc, VALUE *argv, VALUE self)
 		ancestor_tree = NULL;
 
 	error = git_merge_trees(&index, repo, ancestor_tree, tree, other_tree, &opts);
+	if (error == GIT_EMERGECONFLICT)
+		return Qnil;
+
 	rugged_exception_check(error);
 
 	return rugged_index_new(rb_cRuggedIndex, rb_repo, index);

lib/rugged/version.rb

@@ -1,3 +1,3 @@
 module Rugged
-  Version = VERSION = '0.24.0b3'
+  Version = VERSION = '0.24.0b4'
 end