braid 1.0.9 → 1.0.10
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/.ruby-version +1 -1
- data/lib/braid/commands/push.rb +1 -2
- data/lib/braid/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: 37be2b94c125a05dd9b215f3146a4938cebcc5ed
|
|
4
|
+
data.tar.gz: 9b83f817454c020924e75e88fe2aa19cef967b81
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 06a6f9f7aefd950057e3708c3c86d0d98222fff882740d8efa82c36ef1e77eb1a8c9f618b6bd865b7e294fc6b8f4adc1db3cbcca9d48ab8aba07d325a45935b1
|
|
7
|
+
data.tar.gz: 22ba789027b7a1612fa4f84fcbacf4fdd90ec8c8867d612a9d0182cbd0492337354e2771b44ddee79a0fb27fd9fd08d3db60556b44d27bf01c4a72a603ede5e4
|
data/.ruby-version
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
2.1
|
|
1
|
+
2.3.1
|
data/lib/braid/commands/push.rb
CHANGED
|
@@ -23,7 +23,6 @@ module Braid
|
|
|
23
23
|
|
|
24
24
|
clone_dir = Dir.tmpdir + "/braid_push.#{$$}"
|
|
25
25
|
Dir.mkdir(clone_dir)
|
|
26
|
-
source_dir = Dir.pwd
|
|
27
26
|
remote_url = git.remote_url(mirror.remote)
|
|
28
27
|
if remote_url == mirror.cached_url
|
|
29
28
|
remote_url = mirror.url
|
|
@@ -33,7 +32,7 @@ module Braid
|
|
|
33
32
|
Dir.chdir(clone_dir) do
|
|
34
33
|
msg 'Cloning mirror with local changes.'
|
|
35
34
|
git.init
|
|
36
|
-
git.fetch(
|
|
35
|
+
git.fetch(mirror.cached_url) if File.exist?(mirror.cached_url)
|
|
37
36
|
git.fetch(remote_url, "+refs/heads/#{mirror.branch}")
|
|
38
37
|
git.checkout(base_revision)
|
|
39
38
|
git.apply(diff)
|
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.10
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Cristi Balan
|
|
@@ -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.5.1
|
|
145
145
|
signing_key:
|
|
146
146
|
specification_version: 4
|
|
147
147
|
summary: A simple tool for tracking vendor branches in git.
|