ebm 0.0.33 → 0.0.34
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/pull.rb +3 -3
- data/lib/info.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
data.tar.gz:
|
|
4
|
-
metadata.gz:
|
|
3
|
+
data.tar.gz: 880aa4afa58fb431557e4c536274c9d6e3e2b58b
|
|
4
|
+
metadata.gz: ca00f9018019aac30177d270abeace65ff36ae5e
|
|
5
5
|
SHA512:
|
|
6
|
-
data.tar.gz:
|
|
7
|
-
metadata.gz:
|
|
6
|
+
data.tar.gz: 9fdc5737c5a322c469aabb9923afe7c970bc2e0bcf11c613a1aac8dbe1cccd6a67ecab661b90d99aa6f931a98b91f2bc718c7b359717dc34c654c7c891dc7a92
|
|
7
|
+
metadata.gz: 3085c7992fba5e92ee3a5800837d1cd9ac8d833f708d711f1d3ff058d4f27d9151c031cc41a755ab5d3fd43be23b9f7ab35cadb78499759864fcd68d5e7996b0
|
data/lib/commands/pull.rb
CHANGED
|
@@ -94,16 +94,16 @@ module Commands
|
|
|
94
94
|
elsif repo[:create_dev_branch]
|
|
95
95
|
if remote_version
|
|
96
96
|
# pulling from remote version branch
|
|
97
|
-
cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{branch}"
|
|
97
|
+
cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes origin #{branch}"
|
|
98
98
|
elsif base_version
|
|
99
99
|
# pulling from base remote version branch
|
|
100
100
|
if base_branch.nil?
|
|
101
101
|
raise "You specified base-version but the config has no base_branch."
|
|
102
102
|
end
|
|
103
|
-
cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes origin #{base_branch}"
|
|
103
|
+
cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes origin #{base_branch}"
|
|
104
104
|
else
|
|
105
105
|
# pull from the remote branch of the current branch
|
|
106
|
-
cmd = "git pull #{dry_run} --no-edit --recurse-submodules=yes"
|
|
106
|
+
cmd = "git pull #{dry_run} --no-ff --no-edit --recurse-submodules=yes"
|
|
107
107
|
end
|
|
108
108
|
|
|
109
109
|
exit_code = EbmSharedLib::CL.do_cmd_ignore_str(cmd, "Automatic merge failed", repo_path)
|
data/lib/info.rb
CHANGED
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ebm
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.34
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Greg Seitz
|
|
@@ -9,7 +9,7 @@ autorequire:
|
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
11
|
|
|
12
|
-
date: 2013-10-
|
|
12
|
+
date: 2013-10-22 00:00:00 Z
|
|
13
13
|
dependencies:
|
|
14
14
|
- !ruby/object:Gem::Dependency
|
|
15
15
|
name: subcommand
|