sti_deploy 0.4.4 → 0.4.5
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/sti_deploy/git/merge.rb +5 -5
- data/lib/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: b32c5c55dad4c8572945ba195619cfcd947c6130
|
|
4
|
+
data.tar.gz: 58328097709430fbba451fef09810951332d4123
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: b8f32e11d8c65c9fd49cd1a18da50b7614b34b9207823405561c59a00f07904eaa5e21b77c16a26065cc398f2d974ce1134b37718264376c5f509795fbd465fd
|
|
7
|
+
data.tar.gz: 573146a61167cef8f9e1d8cb34bf14f47a05baa2593eb8f5eca677914316f2539a455a82299639795a68546732191d2509915e0264cce1bb69524af2f8b56e8e
|
data/lib/sti_deploy/git/merge.rb
CHANGED
|
@@ -20,27 +20,27 @@ module StiDeploy
|
|
|
20
20
|
# Makes sure the branch is updated
|
|
21
21
|
def update_target_branch!
|
|
22
22
|
return true if Git.checkout(branch: target) && Git.pull(branch: target)
|
|
23
|
-
Messages.puts('git.pull_error', origin:
|
|
23
|
+
Messages.puts('git.pull_error', origin: origin, color: :red)
|
|
24
24
|
exit(4)
|
|
25
25
|
end
|
|
26
26
|
|
|
27
27
|
def try_merge!
|
|
28
28
|
return true if Git.merge(branch: origin)
|
|
29
|
-
Messages.puts('git.merge_error', origin:
|
|
30
|
-
|
|
29
|
+
Messages.puts('git.merge_error', origin: origin, target: target,
|
|
30
|
+
color: :red)
|
|
31
31
|
exit(4)
|
|
32
32
|
end
|
|
33
33
|
|
|
34
34
|
def finalize_merge!
|
|
35
35
|
return true if Git.push(branch: target) && Git.checkout(branch: origin)
|
|
36
|
-
Messages.puts('git.push_error', target:
|
|
36
|
+
Messages.puts('git.push_error', target: target, color: :red)
|
|
37
37
|
exit(4)
|
|
38
38
|
end
|
|
39
39
|
|
|
40
40
|
# It only needs to merge if the origin branch is different from the
|
|
41
41
|
# target branch (no need to merge to the same branch).
|
|
42
42
|
def needs_merge?
|
|
43
|
-
|
|
43
|
+
origin.to_s != target.to_s
|
|
44
44
|
end
|
|
45
45
|
end
|
|
46
46
|
end
|
data/lib/version.rb
CHANGED