hu 1.4.8 → 1.4.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 92dd0aaf631fa4a14a664d49696d26fc1613e489
-  data.tar.gz: 84999b99f90adb521ff81b8ef1b5f8e81af8f3f7
+  metadata.gz: d4024dee7a35f4bf33771b3a9b289bf658ee931d
+  data.tar.gz: 08a101b079b0420a6cbbcdd5c19acef6aaeb88dd
 SHA512:
-  metadata.gz: 355263087c8e741f45a931a7ff617f750efb3ff24b48f35b0795457c851d76feb930666b9406965b18a5b630bd4fb98a8d939045e7e2e2811b7f37476f483c7c
-  data.tar.gz: 74453615e00dfa216e2778540f80eb4aaca6a17826a49bfe94ec963696b7ae09b856d4b7198d39b0f9a234d0a858e18aee3251d72512cac04010c83958b47a9c
+  metadata.gz: 4400cd353b4cf5ce394096b428e3f7c51c7baa67b9cc407407866e564119c33dab88b64492f6d12c019e1d74efe702608c90b80a6c12e26520e4fcfad1244683
+  data.tar.gz: 08fc5de1a0a8b72b96c61b769f6850f134c462d83080543d10b94e66ae033cb24652c0b4d3252b0c1c2cf585ced4deb88d0e9347f8e62261f6a97114ef0056a0

data/lib/hu/deploy.rb

@@ -149,13 +149,13 @@ module Hu
         wc_update.join
         unbusy
 
-        # unless develop_can_be_merged_into_master?
-        #   puts
-        #   puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
-        #   puts "       Aborting early to prevent a merge conflict.".color(:red)
-        #   puts
-        #   exit 1
-        # end
+        unless develop_can_be_merged_into_master?
+          puts
+          puts "ERROR: It seems like a merge of 'develop' into 'master' would fail.".color(:red)
+          puts "       Aborting early to prevent a merge conflict.".color(:red)
+          puts
+          exit 1
+        end
 
         highest_version = find_highest_version_tag
         begin
@@ -870,9 +870,8 @@ module Hu
         :quiet
         :nospinner
         :return
-        git checkout develop
-        git diff --exit-code --quiet develop..master || { git format-patch master --stdout >/tmp/hu.diff.tmp && git checkout master && git apply --check </tmp/hu.diff.tmp ; } || [ ! -s /tmp/hu.diff.tmp ]
-        rm -f /tmp/hu.diff.tmp
+        git checkout master && git merge --no-commit --no-ff develop || { git merge --abort; false ;}
+        git merge --abort || true
         EOS
         status == 0
       end

data/lib/hu/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module Hu
-  VERSION = '1.4.8'
+  VERSION = '1.4.9'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hu
 version: !ruby/object:Gem::Version
-  version: 1.4.8
+  version: 1.4.9
 platform: ruby
 authors:
 - moe