ggsm 1.8.4 → 1.8.5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/ggsm/command/mr.rb +1 -1
- data/lib/ggsm/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: b8c33a9dea49e9c1ea75d460b5c88319cd218585
|
|
4
|
+
data.tar.gz: c42c5835dfcf5271681f87f0e10b4c7a4a70ce91
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 4774dcea138c72d5aa5a9facea144d0fe21a47b866c5e7981f9149b57f4f3d93bc4712813d120218454127520582bf838991d48ff328b1db3341343a0c551783
|
|
7
|
+
data.tar.gz: b330e57cffeb4c68784bddefc77d0beecd1f084f20786efcfcfa115a27fd91ff08e886fa95fdb0ddbe65d9d92f7bd530b60361e9bc32fe20196d79d129a6ecb9
|
data/lib/ggsm/command/mr.rb
CHANGED
|
@@ -79,7 +79,7 @@ module GGSM
|
|
|
79
79
|
current_branch_head_commit = get_head_commit("origin/#{@@current_branch}").chomp
|
|
80
80
|
|
|
81
81
|
if current_branch_head_commit!="origin/#{@@current_branch}" && # 判断远程分支是否存在
|
|
82
|
-
|
|
82
|
+
get_head_commit("origin/#{@@current_branch}") != get_head_commit("origin/#{@@target_branch}")
|
|
83
83
|
# origin git@git.souche.com:Destiny_Android/Destiny_Android.git (push)
|
|
84
84
|
# origin http://git.souche.com/Destiny_Android/Mine.git (push)
|
|
85
85
|
result = `git remote -v | grep push`
|
data/lib/ggsm/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ggsm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.8.
|
|
4
|
+
version: 1.8.5
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- YoKey
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2017-12-
|
|
11
|
+
date: 2017-12-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|