podsorz 0.0.17 → 0.0.18
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/podsorz/core/PodsOrz/pods_git_operator.rb +2 -1
- data/lib/podsorz/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 2f9a1be896ca26ca6fa5d77c136e1c3b27a5add1f1e9b881865d3bb934ecb7b6
|
|
4
|
+
data.tar.gz: 0300d610bd8baf518e6a1f669ac6c181cdfcbb822f0d786b623df63a0e80dcc0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 2793f97127fa2e654753a188543d9dee46f6c66e3ff9b081f4266e77b1a842f1a45025b2434261b65c5697807d0cd563a122d2ff84d0ea40d2456df5860a13e8
|
|
7
|
+
data.tar.gz: dcc5abc81395accba5aeae6654e369265a8916d84c7cb6e08c8a3d08578da2b369da4c755691adf39a636bb2eb87cb9b04e658e3800d7a5804941dc618970e09
|
|
@@ -321,7 +321,7 @@ module PodsOrz
|
|
|
321
321
|
is_release = current_branch.include? "release"
|
|
322
322
|
|
|
323
323
|
if is_develop || is_release
|
|
324
|
-
|
|
324
|
+
return is_push_success
|
|
325
325
|
end
|
|
326
326
|
|
|
327
327
|
#feature
|
|
@@ -371,6 +371,7 @@ module PodsOrz
|
|
|
371
371
|
merge_cmd_list = []
|
|
372
372
|
merge_cmd_list << "cd #{pod_file_path}"
|
|
373
373
|
merge_cmd_list << "git checkout #{base_on_branch}"
|
|
374
|
+
merge_cmd_list << "git pull --rebase"
|
|
374
375
|
merge_cmd_list << "git merge #{current_branch} --no-ff --no-squash --no-edit"
|
|
375
376
|
merge_cmd_list << "git push -u origin #{base_on_branch}"
|
|
376
377
|
IO.popen(merge_cmd_list.join(";")) do |io|
|
data/lib/podsorz/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: podsorz
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.18
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Xiangqi
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2022-06-27 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: gli
|