rugged 0.26.0b1 → 0.26.0b2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b1dd3ce63e4c8e41cc6b04950f6c4fa362e0fa1a
-  data.tar.gz: 8c814affe49194cf47e62db78b6a9a5ce8aceac2
+  metadata.gz: 531102627a60b977fe0498feaaa9ef74ff2756f3
+  data.tar.gz: 612617fc8a6078456b44439ba68bdb6891d1e422
 SHA512:
-  metadata.gz: 5f16ed52fe780c821490e08db1143e9cd0ab75707e735a7913df2ac84f7e00299a10b1d438733358a5949890fbedf90df169e0761c07516091589e4daf78343e
-  data.tar.gz: c41dd20c1066a54ba80f30d60353eba731075cc3aa1793817409b7781b8609307172a3643defa465205113c1032b18cfb5ad66fd1c3e5415a7dd550acaabd1c2
+  metadata.gz: a6654148d44339c08e7727429f3f7e163c92295b5af8737d62579fe9ef7c61b179f54a9a76815d213afa302d82d1a6769d7d1fb5df0a2023de08ea67f87dec56
+  data.tar.gz: fa94b1dc85ab86e5f2f2d663f0205ccdc3dcb7a1237c530ed0a046496885c7bda173b6c9266672df40bec36ac11f6ca056565c71b7388f9f5366fd4f2844d6ee

data/ext/rugged/rugged_tree.c

@@ -487,8 +487,8 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
 			}
 		}
 
-		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("renames")))) {
-			opts->flags |= GIT_MERGE_FIND_RENAMES;
+		if (rb_hash_aref(rb_options, CSTR2SYM("renames")) == Qfalse) {
+			opts->flags &= ~GIT_MERGE_FIND_RENAMES;
 		}
 
 		if (RTEST(rb_hash_aref(rb_options, CSTR2SYM("fail_on_conflict")))) {
@@ -515,7 +515,8 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
  *  The following options can be passed in the +options+ Hash:
  *
  *  :renames ::
- *    If true, looking for renames will be enabled (`--find-renames`).
+ *    If true, looking for renames will be enabled (`--find-renames`),
+ *    set to false to disable (default true).
  *
  *  :rename_threshold ::
  *    An integer specifying the minimum similarity of a file to be

data/lib/rugged/version.rb

@@ -4,5 +4,5 @@
 # For full terms see the included LICENSE file.
 
 module Rugged
-  Version = VERSION = '0.26.0b1'
+  Version = VERSION = '0.26.0b2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 0.26.0b1
+  version: 0.26.0b2
 platform: ruby
 authors:
 - Scott Chacon
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-03 00:00:00.000000000 Z
+date: 2017-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler