flash_flow 1.6.1 → 1.6.2
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/.gitignore +1 -0
- data/Gemfile.lock +1 -1
- data/lib/flash_flow/git.rb +10 -0
- data/lib/flash_flow/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 20fe9b2c9a6e87cc95f3863eef066cf3b2d9e194
|
|
4
|
+
data.tar.gz: b7f8f0877729bd2647d57382c6c8f29b5f6eaaa3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f9a074d152af4e9636bcb5da5013d9fecd09b9d419248c4265198c60eab74feb551ba70a959ac2dafe686d0d68fee888ac58ee4748e8cd3702075c391f78fc4f
|
|
7
|
+
data.tar.gz: 7f361566b040768d30489a18a23c51920bf1e98d4cd3147a9d3dca9575d9684c4377fd3b30eff58cc60d1ff428ff180b52221eeb46f138010d80ec43411b7141
|
data/.gitignore
CHANGED
data/Gemfile.lock
CHANGED
data/lib/flash_flow/git.rb
CHANGED
|
@@ -182,6 +182,7 @@ module FlashFlow
|
|
|
182
182
|
end
|
|
183
183
|
|
|
184
184
|
def copy_temp_to_branch(branch, squash_message = nil)
|
|
185
|
+
reset_local_merge_branch
|
|
185
186
|
run("checkout #{temp_merge_branch}")
|
|
186
187
|
run("merge --strategy=ours --no-edit #{branch}")
|
|
187
188
|
run("checkout #{branch}")
|
|
@@ -190,6 +191,15 @@ module FlashFlow
|
|
|
190
191
|
squash_commits(branch, squash_message) if squash_message
|
|
191
192
|
end
|
|
192
193
|
|
|
194
|
+
def reset_local_merge_branch
|
|
195
|
+
in_branch(master_branch) do
|
|
196
|
+
run("branch -D #{merge_branch}")
|
|
197
|
+
run("checkout -b #{merge_branch}")
|
|
198
|
+
run("reset --hard #{remote}/#{merge_branch}")
|
|
199
|
+
run("clean -x -f -d")
|
|
200
|
+
end
|
|
201
|
+
end
|
|
202
|
+
|
|
193
203
|
def delete_temp_merge_branch
|
|
194
204
|
in_branch(master_branch) do
|
|
195
205
|
run("branch -d #{temp_merge_branch}")
|
data/lib/flash_flow/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: flash_flow
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 1.6.
|
|
4
|
+
version: 1.6.2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Brad Bennett
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2018-12-
|
|
11
|
+
date: 2018-12-13 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: octokit
|