hu 1.3.20 → 1.3.21

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/hu/deploy.rb +2 -1
  3. data/lib/hu/version.rb +1 -1
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 7ebf6d97a25b18af1c6168080a870edaddfbd1bb
4
- data.tar.gz: ac4a4cbf64432c6fa5ce821609f53e9e23d93b74
3
+ metadata.gz: 48fbe0e37d4450c0418a0a968697faf2b06d62af
4
+ data.tar.gz: da937d8659ab3cb72b3aae802c71aaf5fbde0039
5
5
  SHA512:
6
- metadata.gz: c5c85abf52eef7637fd13c3448942404db774a1ff778977e093eb456b4e7f5b66674c4e842bdba66bd47b15db4b922a187487f511bb65b57478d46f7a98d71ac
7
- data.tar.gz: 2c61c69e9c85fa066574f47512cee88f590242883c5349daceef552a98c67680c06eec12545a68a64759cc7774b4e8f04cd2c995a933f0c34cda29a3035110ff
6
+ metadata.gz: a6cf1564577989c0e314959d65068aebd73b3282c005e1c12c431cb369f97429b658d3f42c82571063a3bc26d911c8e69af15da503edc1d4d279ca624ac4d5a3
7
+ data.tar.gz: cd7e2f46d08abc031aa036e18849104421c3aae45aa835f634615369a18dd4e2bba8bed93d8416b525550f4f9e106092ddc85b7d71e7aaf6b3478c37e3d7b48e
data/lib/hu/deploy.rb CHANGED
@@ -801,7 +801,8 @@ module Hu
801
801
 
802
802
  def abort_merge
803
803
  run_each <<-EOS.strip_heredoc
804
- # Abort failed merge
804
+ :return
805
+ # Abort failed merge (if any)
805
806
  git merge --abort
806
807
  EOS
807
808
  Hu::Tm.t(:abort_merge, cmd: 'deploy')
data/lib/hu/version.rb CHANGED
@@ -1,4 +1,4 @@
1
1
  # frozen_string_literal: true
2
2
  module Hu
3
- VERSION = '1.3.20'
3
+ VERSION = '1.3.21'
4
4
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: hu
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.20
4
+ version: 1.3.21
5
5
  platform: ruby
6
6
  authors:
7
7
  - moe