Method: Rugged::Diff#merge!

Defined in:
ext/rugged/rugged_diff.c

#merge!(other_diff) ⇒ self

Merges all diff information from other_diff.

Returns:

  • (self) 

279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
 
# File 'ext/rugged/rugged_diff.c', line 279

static VALUE rb_git_diff_merge(VALUE self, VALUE rb_other)
{
	git_diff *diff;
	git_diff *other;
	int error;

	if (!rb_obj_is_kind_of(rb_other, rb_cRuggedDiff))
		rb_raise(rb_eTypeError, "A Rugged::Diff instance is required");

	Data_Get_Struct(self, git_diff, diff);
	Data_Get_Struct(rb_other, git_diff, other);

	error = git_diff_merge(diff, other);
	rugged_exception_check(error);

	return self;
}