ghpages_deploy 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b35f38b0196a50b325f381543805ebfbc1f38f47
-  data.tar.gz: 36ebb1d01aafc3691e93828776b3d625862812dd
+  metadata.gz: 59ac136640fdcc0432608421513d74cb75d17262
+  data.tar.gz: df337b6b4cf6607a8a5f69c8fdb256418575193d
 SHA512:
-  metadata.gz: d4974b458cf20f06c0c5a164a829efea888d26f8b8dcb3a81a8a29904cb114e0fab3caa0099a43b43a7cfc0fa8d59874c1c0f48e24db8143be18845b4fd7f52a
-  data.tar.gz: 0d9bc46ee6d830106c063662271cf40e1d59649905ad6820b9576595e0e16a833f1dcc9d465f889103eeb0882ff7ac14853477c6cdd424132f835dd88dfeee09
+  metadata.gz: 9878ee14bfc7d0364948636c822379ab1c1b34a02468ab478f4659912c7bdeb548fd4ad9fc24e730c2f7ad5e60bd89b3aa86f959be9cd3c7f346fe15659e2bb3
+  data.tar.gz: 7135d4bc20cbfa153d8deba5bc2d19769e3eb3f14158b4a464a220cd20117f47950847ee33e4c3d458b5eb253d6192ebbacfd7eae154afe3beef7df39d236024

data/lib/ghpages_deploy/git_manager.rb

@@ -88,6 +88,10 @@ module GithubPages
 
       # remove files already staged by checkout
       @git.remove staged_modifications('.')
+
+      if @git.is_remote_branch?(branch)
+        @git.pull(remote, branch)
+      end
     end
 
     def setup_credentials

data/lib/ghpages_deploy/version.rb

@@ -2,5 +2,5 @@
 # Copyright (c) 2016 Nathan Currier
 
 module GithubPages
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ghpages_deploy
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Nathan Currier