ggsm 1.7.4 → 1.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6951ec56f6d1dd8b7f8b2e0d970bb13e069b6b80
-  data.tar.gz: 9d640190be966e170a6cea8813af267d9e1ceb07
+  metadata.gz: e3eaf487f019f4facded88933f80e7d5ec0cec32
+  data.tar.gz: 23628efe9ba46fe4b66604b74843240fc245edc3
 SHA512:
-  metadata.gz: 2cd98b5ea06081d8003502cc569beb88af56fc5160e19b590ca86a7c8725bc915ebcd6c61c46e9b76fa9bafabcb230bf3b5e1f03ba9e8ad646b127829917b9d3
-  data.tar.gz: a6374c86d53bd14819349e87be2c55e48615615fc49e18d0d58f1129311598f5756e0f971c47d1d74ac8999c852413c60158cf3e42b747a58865c16d67432c7b
+  metadata.gz: 995a6b7feba702935201b0a358935b2969aa63ce07e9dbc5c659b3e01eff362fa46267f85907ecad624be7dcdbc17eb979ee4d88e50af7bf121e637080617b60
+  data.tar.gz: 85684a06dbb55a420d93850352ce5dfd3d46ae3a01d1072bb1005bf35321efb13f5f7387bb6a2961c0a7c386e5fe3f6f038a36ea4e8f1fbf3da2491aa6719cb7

data/lib/ggsm/command/merge.rb

@@ -12,6 +12,9 @@ module GGSM
       arry_conflict = []
 
       foreach_module {|sub|
+        if branch.start_with?('origin/')
+          `git fetch | grep 'ignored'`
+        end
         process_merge(arry_conflict, sub, branch)
       }
 
@@ -22,6 +25,10 @@ module GGSM
         main_rebase = true
       end
 
+      if branch.start_with?('origin/')
+        `git fetch | grep 'ignored'`
+      end
+
       if need_rebase(branch) || force_rebase
         process_rebase(arry_conflict, branch)
         puts 'Tip: 主工程rebase模式'.blue

data/lib/ggsm/command/start.rb

@@ -16,6 +16,12 @@ module GGSM
       current_branch = get_current_branch
 
       need_stash = try_stash
+      if action.start_with?('origin/')
+        need_fetch = `git fetch`
+        if need_fetch != ''
+          `git submodule foreach git fetch | grep 'ignored'`
+        end
+      end
       result = system "git checkout -b #{branch} #{action}"
       if need_stash
         stash_pop(arry_conflict, '主工程')

data/lib/ggsm/command/switch.rb

@@ -29,6 +29,9 @@ module GGSM
       sub_commits = get_submodule_commit
 
       foreach_module {|sub, index|
+        if is_sync
+          `git fetch | grep 'ignored'`
+        end
         process_switch(arry_commit_not_exist, arry_conflict, branch, index, sub, sub_commits)
       }
 

data/lib/ggsm/util/hooks.rb

@@ -39,13 +39,8 @@ module GGSM
 
     def cp_files(target_path)
       path = `gem which ggsm`.split('/ggsm.rb')[0]
-      begin
       `cp #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
       `cp #{path}/ggsm/hook/pre-commit  #{target_path}/pre-commit`
-      rescue => e
-        `copy #{path}/ggsm/hook/commit-msg #{target_path}/commit-msg`
-        `copy #{path}/ggsm/hook/pre-commit  #{target_path}/pre-commit`
-      end
     end
   end
 end

data/lib/ggsm/version.rb

@@ -1,3 +1,3 @@
 module GGSM
-  VERSION = '1.7.4'
+  VERSION = '1.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ggsm
 version: !ruby/object:Gem::Version
-  version: 1.7.4
+  version: 1.7.5
 platform: ruby
 authors:
 - YoKey
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-20 00:00:00.000000000 Z
+date: 2017-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler