braid 1.0.7 → 1.0.8
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/lib/braid/operations.rb +2 -3
- data/lib/braid/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f05634e9b4c3022e78ae6c0af53e9820e6cb3bf1
|
|
4
|
+
data.tar.gz: 73cf6f286841a8e37df2c6aa5d4692dc2a168106
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 823414ff4155dabb3e432953a49f05d68a16b0e504dc8aa29dfd4cae45132d1c664cb935106af0a03ec5403e44b0c4f2bc90783fb2c51129674407dd25b42f01
|
|
7
|
+
data.tar.gz: 1667e256843a3026d249460ed8ad0faaceb6015008f860f29f8ef68c6c70528c3e0c8a37da0ea3c06ba293ad6d7711253f7e551ad2ccef406d3e7d167d8cb845
|
data/lib/braid/operations.rb
CHANGED
|
@@ -250,9 +250,8 @@ module Braid
|
|
|
250
250
|
# TODO which options are needed?
|
|
251
251
|
invoke(:merge, '-s subtree --no-commit --no-ff', opt)
|
|
252
252
|
true
|
|
253
|
-
rescue ShellExecutionError
|
|
254
|
-
|
|
255
|
-
raise MergeError, ''
|
|
253
|
+
rescue ShellExecutionError => error
|
|
254
|
+
raise MergeError, error.out
|
|
256
255
|
end
|
|
257
256
|
|
|
258
257
|
# Merge three trees (local_treeish should match the current state of the
|
data/lib/braid/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: braid
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.0.
|
|
4
|
+
version: 1.0.8
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Cristi Balan
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2017-01-
|
|
13
|
+
date: 2017-01-30 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: main
|
|
@@ -141,7 +141,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
141
141
|
version: '0'
|
|
142
142
|
requirements: []
|
|
143
143
|
rubyforge_project: braid
|
|
144
|
-
rubygems_version: 2.
|
|
144
|
+
rubygems_version: 2.2.2
|
|
145
145
|
signing_key:
|
|
146
146
|
specification_version: 4
|
|
147
147
|
summary: A simple tool for tracking vendor branches in git.
|