braid 1.0.11 → 1.0.12
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/braid/commands/push.rb +5 -2
- data/lib/braid/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 24d46a675989e3efc64a5cd7cbcf16b200a31a8b
|
|
4
|
+
data.tar.gz: cffec3974cfe536a77cae313e683bfeb634835cd
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: afad55372e3be6ac29f9a94e7e4c53eb5c3333fbf825040fb5ebdb46397a18dd1a8d0a978d34b4c280d7cf2bcbd28e51502cd58f068bbbebcf8bb38f670b3b82
|
|
7
|
+
data.tar.gz: 365c4c3c0eab6b3f000c183376175e7bdbb14e7e0353dc3d380a8b6d0842bb49076423c6530725b19b7bef9c29782d9db184110b7fe032248b4e0004137b1e76
|
data/lib/braid/commands/push.rb
CHANGED
|
@@ -5,19 +5,22 @@ module Braid
|
|
|
5
5
|
module Commands
|
|
6
6
|
class Push < Command
|
|
7
7
|
def run(path, options = {})
|
|
8
|
-
mirror
|
|
8
|
+
mirror = config.get!(path)
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
setup_remote(mirror)
|
|
11
|
+
mirror.fetch
|
|
11
12
|
|
|
12
13
|
base_revision = git.rev_parse(mirror.remote)
|
|
13
14
|
unless mirror.merged?(base_revision)
|
|
14
15
|
msg 'Mirror is not up to date. Stopping.'
|
|
16
|
+
clear_remote(mirror, options)
|
|
15
17
|
return
|
|
16
18
|
end
|
|
17
19
|
|
|
18
20
|
diff = mirror.diff
|
|
19
21
|
if diff.empty?
|
|
20
22
|
msg 'No local changes found. Stopping.'
|
|
23
|
+
clear_remote(mirror, options)
|
|
21
24
|
return
|
|
22
25
|
end
|
|
23
26
|
|
data/lib/braid/version.rb
CHANGED