lib/hu/deploy.rb in hu-1.4.6 vs lib/hu/deploy.rb in hu-1.4.7

@@ -869,10 +869,10 @@
         status = run_each <<-EOS.strip_heredoc
         :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 ; }
+        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
         EOS
         status == 0
       end