ghpages_deploy 2.0.4 → 2.0.5
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.
- checksums.yaml +4 -4
- data/lib/ghpages_deploy/git_manager.rb +9 -6
- data/lib/ghpages_deploy/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5695aefa1d725f21d9ec7d614d10871ffd1a7680
|
|
4
|
+
data.tar.gz: 587efc96eb82689548d682dbe081bb97f044881f
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 74d6f759278ffdbd06fcf1570c7882bdd2a712fd1d751c9008493ccb8e7401f2d21efa80d768bd6e6de2681623c81abe0a21a1d0bf4ae49307d004f931eeb699
|
|
7
|
+
data.tar.gz: 2c0d74328bbc22a0541421d0cb7c5c6aacee7c44354ef9c5944765bd2ed9f612742d00c08b11828e10523a37553bbf3fe16482b202e55af27548f2b5dc66bb96
|
|
@@ -93,16 +93,19 @@ module GithubPages
|
|
|
93
93
|
git "clean -d -x -f -e #{@preserved}"
|
|
94
94
|
end
|
|
95
95
|
|
|
96
|
+
def remote_branch
|
|
97
|
+
@git.branches.remote.find do |br|
|
|
98
|
+
br.name == branch && br.remote == remote
|
|
99
|
+
end
|
|
100
|
+
end
|
|
101
|
+
|
|
96
102
|
def setup_branch
|
|
97
|
-
if
|
|
98
|
-
|
|
99
|
-
remove_staged
|
|
100
|
-
elsif @git.is_remote_branch?(branch)
|
|
101
|
-
git "checkout #{remote}/#{branch} -b #{branch}"
|
|
103
|
+
if br = remote_branch
|
|
104
|
+
br.checkout
|
|
102
105
|
remove_staged
|
|
103
106
|
@git.pull(remote, branch)
|
|
104
107
|
else
|
|
105
|
-
git "checkout --orphan #{branch}"
|
|
108
|
+
git "checkout --orphan #{remote}/#{branch}"
|
|
106
109
|
remove_staged
|
|
107
110
|
end
|
|
108
111
|
end
|