ebm 0.0.11 → 0.0.12
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/commands/prepare.rb +7 -2
- data/lib/info.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: 8ad007e4af3a408677cb93bc4df24416f14238a4
|
4
|
+
data.tar.gz: 2a7a8ed1badc38a107658cac981bb3a62e14d165
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: f171c575262087494253ed30c057dec0affd6d2d9195a9592017dc6da2286ed33dd008d038446f0c69834e23eaa4c2e1b34fee4410a995dca24e174f3085a58c
|
7
|
+
data.tar.gz: 794b5095d08a3f7d847273c8cd290e25f419b1bcd75a8b2785b52fc24dea257752ba98a9f8644b0f668eee791a2c9a924cbed20f3157451f1add3cbc76f35206
|
data/lib/commands/prepare.rb
CHANGED
@@ -88,9 +88,14 @@ module Commands
|
|
88
88
|
# now create the developer branch off of the base branch
|
89
89
|
if create_dev_branch
|
90
90
|
dev_branch_name = "#{initials}_#{branch}"
|
91
|
-
|
91
|
+
# first assume dev branch already exists and try to switch to it
|
92
|
+
cmd = "git checkout --track origin/#{dev_branch_name}"
|
92
93
|
if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
|
93
|
-
|
94
|
+
# no remote branch, so create local and push as remote
|
95
|
+
cmd = "git checkout -B #{dev_branch_name} && git push -u origin #{dev_branch_name}"
|
96
|
+
if EbmSharedLib::CL.do_cmd_result(cmd, repo_path) != 0
|
97
|
+
raise "Unable to create local and tracking developer branch #{dev_branch_name} for #{repo_name}."
|
98
|
+
end
|
94
99
|
end
|
95
100
|
end
|
96
101
|
elsif tag
|
data/lib/info.rb
CHANGED