Merge pull request #646 from libgit2/vmg/fixes

Compiler Warning fixes

Author: Vicent Martí

ext/rugged/rugged_blob.c

@@ -607,7 +607,7 @@ static int rugged_load_merge_file_input(git_blob **out, git_repository *repo, ru
 
 static VALUE rb_git_blob_merge_files(int argc, VALUE *argv, VALUE klass)
 {
-	VALUE rb_repo, rb_ancestor, rb_ours, rb_theirs, rb_options, rb_result;
+	VALUE rb_repo, rb_ancestor, rb_ours, rb_theirs, rb_options, rb_result = Qnil;
 
 	git_repository *repo = NULL;
 	rugged_merge_file_input ancestor = RUGGED_MERGE_FILE_INPUT_INIT,

ext/rugged/rugged_patch.c

@@ -209,11 +209,10 @@ static VALUE rb_git_diff_patch_lines(int argc, VALUE *argv, VALUE self)
 {
 	git_patch *patch;
 	size_t lines = 0;
+	int options = 0;
 	VALUE rb_options;
 	Data_Get_Struct(self, git_patch, patch);
 
-	int options = 0;
-
 	rb_scan_args(argc, argv, "0:", &rb_options);
 	if (!NIL_P(rb_options)) {
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("exclude_context")))) {

test/commit_test.rb

@@ -519,7 +519,7 @@ def test_format_to_mbox_multiple
 ---
  file2.txt | 5 +++++
  file3.txt | 5 +++++
- 2 files changed, 10 insertions(+), 0 deletions(-)
+ 2 files changed, 10 insertions(+)
  create mode 100644 file2.txt
  create mode 100644 file3.txt