ggsm 1.7.4 → 1.7.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/merge.rb +7 -0
- data/lib/ggsm/command/start.rb +6 -0
- data/lib/ggsm/command/switch.rb +3 -0
- data/lib/ggsm/util/hooks.rb +0 -5
- 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: e3eaf487f019f4facded88933f80e7d5ec0cec32
|
4
|
+
data.tar.gz: 23628efe9ba46fe4b66604b74843240fc245edc3
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 995a6b7feba702935201b0a358935b2969aa63ce07e9dbc5c659b3e01eff362fa46267f85907ecad624be7dcdbc17eb979ee4d88e50af7bf121e637080617b60
|
7
|
+
data.tar.gz: 85684a06dbb55a420d93850352ce5dfd3d46ae3a01d1072bb1005bf35321efb13f5f7387bb6a2961c0a7c386e5fe3f6f038a36ea4e8f1fbf3da2491aa6719cb7
|
data/lib/ggsm/command/merge.rb
CHANGED
@@ -12,6 +12,9 @@ module GGSM
|
|
12
12
|
arry_conflict = []
|
13
13
|
|
14
14
|
foreach_module {|sub|
|
15
|
+
if branch.start_with?('origin/')
|
16
|
+
`git fetch | grep 'ignored'`
|
17
|
+
end
|
15
18
|
process_merge(arry_conflict, sub, branch)
|
16
19
|
}
|
17
20
|
|
@@ -22,6 +25,10 @@ module GGSM
|
|
22
25
|
main_rebase = true
|
23
26
|
end
|
24
27
|
|
28
|
+
if branch.start_with?('origin/')
|
29
|
+
`git fetch | grep 'ignored'`
|
30
|
+
end
|
31
|
+
|
25
32
|
if need_rebase(branch) || force_rebase
|
26
33
|
process_rebase(arry_conflict, branch)
|
27
34
|
puts 'Tip: 主工程rebase模式'.blue
|
data/lib/ggsm/command/start.rb
CHANGED
@@ -16,6 +16,12 @@ module GGSM
|
|
16
16
|
current_branch = get_current_branch
|
17
17
|
|
18
18
|
need_stash = try_stash
|
19
|
+
if action.start_with?('origin/')
|
20
|
+
need_fetch = `git fetch`
|
21
|
+
if need_fetch != ''
|
22
|
+
`git submodule foreach git fetch | grep 'ignored'`
|
23
|
+
end
|
24
|
+
end
|
19
25
|
result = system "git checkout -b #{branch} #{action}"
|
20
26
|
if need_stash
|
21
27
|
stash_pop(arry_conflict, '主工程')
|
data/lib/ggsm/command/switch.rb
CHANGED
data/lib/ggsm/util/hooks.rb
CHANGED
@@ -39,13 +39,8 @@ module GGSM
|
|
39
39
|
|
40
40
|
def cp_files(target_path)
|
41
41
|
path = `gem which ggsm`.split('/ggsm.rb')[0]
|
42
|
-
begin
|
43
42
|
`cp #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
|
44
43
|
`cp #{path}/ggsm/hook/pre-commit #{target_path}/pre-commit`
|
45
|
-
rescue => e
|
46
|
-
`copy #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
|
47
|
-
`copy #{path}/ggsm/hook/pre-commit #{target_path}/pre-commit`
|
48
|
-
end
|
49
44
|
end
|
50
45
|
end
|
51
46
|
end
|
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.7.
|
4
|
+
version: 1.7.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-
|
11
|
+
date: 2017-11-01 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: bundler
|