hu 1.3.20 → 1.3.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ebf6d97a25b18af1c6168080a870edaddfbd1bb
-  data.tar.gz: ac4a4cbf64432c6fa5ce821609f53e9e23d93b74
+  metadata.gz: 48fbe0e37d4450c0418a0a968697faf2b06d62af
+  data.tar.gz: da937d8659ab3cb72b3aae802c71aaf5fbde0039
 SHA512:
-  metadata.gz: c5c85abf52eef7637fd13c3448942404db774a1ff778977e093eb456b4e7f5b66674c4e842bdba66bd47b15db4b922a187487f511bb65b57478d46f7a98d71ac
-  data.tar.gz: 2c61c69e9c85fa066574f47512cee88f590242883c5349daceef552a98c67680c06eec12545a68a64759cc7774b4e8f04cd2c995a933f0c34cda29a3035110ff
+  metadata.gz: a6cf1564577989c0e314959d65068aebd73b3282c005e1c12c431cb369f97429b658d3f42c82571063a3bc26d911c8e69af15da503edc1d4d279ca624ac4d5a3
+  data.tar.gz: cd7e2f46d08abc031aa036e18849104421c3aae45aa835f634615369a18dd4e2bba8bed93d8416b525550f4f9e106092ddc85b7d71e7aaf6b3478c37e3d7b48e

data/lib/hu/deploy.rb

@@ -801,7 +801,8 @@ module Hu
 
       def abort_merge
         run_each <<-EOS.strip_heredoc
-        # Abort failed merge
+        :return
+        # Abort failed merge (if any)
         git merge --abort
         EOS
         Hu::Tm.t(:abort_merge, cmd: 'deploy')

data/lib/hu/version.rb

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

metadata

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