rugged 0.26.0b1 → 0.26.0b2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/ext/rugged/rugged_tree.c +4 -3
- data/lib/rugged/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 531102627a60b977fe0498feaaa9ef74ff2756f3
|
|
4
|
+
data.tar.gz: 612617fc8a6078456b44439ba68bdb6891d1e422
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a6654148d44339c08e7727429f3f7e163c92295b5af8737d62579fe9ef7c61b179f54a9a76815d213afa302d82d1a6769d7d1fb5df0a2023de08ea67f87dec56
|
|
7
|
+
data.tar.gz: fa94b1dc85ab86e5f2f2d663f0205ccdc3dcb7a1237c530ed0a046496885c7bda173b6c9266672df40bec36ac11f6ca056565c71b7388f9f5366fd4f2844d6ee
|
data/ext/rugged/rugged_tree.c
CHANGED
|
@@ -487,8 +487,8 @@ void rugged_parse_merge_options(git_merge_options *opts, VALUE rb_options)
|
|
|
487
487
|
}
|
|
488
488
|
}
|
|
489
489
|
|
|
490
|
-
if (
|
|
491
|
-
opts->flags
|
|
490
|
+
if (rb_hash_aref(rb_options, CSTR2SYM("renames")) == Qfalse) {
|
|
491
|
+
opts->flags &= ~GIT_MERGE_FIND_RENAMES;
|
|
492
492
|
}
|
|
493
493
|
|
|
494
494
|
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)
|
|
|
515
515
|
* The following options can be passed in the +options+ Hash:
|
|
516
516
|
*
|
|
517
517
|
* :renames ::
|
|
518
|
-
* If true, looking for renames will be enabled (`--find-renames`)
|
|
518
|
+
* If true, looking for renames will be enabled (`--find-renames`),
|
|
519
|
+
* set to false to disable (default true).
|
|
519
520
|
*
|
|
520
521
|
* :rename_threshold ::
|
|
521
522
|
* An integer specifying the minimum similarity of a file to be
|
data/lib/rugged/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: rugged
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.26.
|
|
4
|
+
version: 0.26.0b2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Scott Chacon
|
|
@@ -9,7 +9,7 @@ authors:
|
|
|
9
9
|
autorequire:
|
|
10
10
|
bindir: bin
|
|
11
11
|
cert_chain: []
|
|
12
|
-
date: 2017-02-
|
|
12
|
+
date: 2017-02-08 00:00:00.000000000 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: rake-compiler
|