git_pr 0.0.12 → 0.0.13.beta.1
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/git_pr/merge.rb +6 -1
- data/lib/git_pr/version.rb +1 -1
- metadata +3 -3
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 2cb9b6b023a2ac2b8f11dce7b92aec1b930b751a
|
4
|
+
data.tar.gz: c77bac089064b8f6b0ea371b88ec632b627ea84f
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5944e0e21eea65d50cb0926da86c92ff4fcc26c22468e1604d33f46eb820b2772f3d76a571176ba61d47037c98a8b5185b2bb9778c1005cea581c2548645b19c
|
7
|
+
data.tar.gz: 4552ce42759cbd9bce1a16e425a28f3cf03b80a595d03d4545911af233bfc24bb087b268d67c7c919cb605f41d6326bf28713a7c165c2a42a5e7744246eca9a8
|
data/lib/git_pr/merge.rb
CHANGED
@@ -105,7 +105,12 @@ module GitPr
|
|
105
105
|
# merge commit is created.
|
106
106
|
puts "Merging changes from '#{rebase_branch}' to '#{target_branch}'"
|
107
107
|
GitPr.run_command "git checkout -q #{target_branch}"
|
108
|
-
|
108
|
+
commit_message = <<EOS
|
109
|
+
Merge #{pull_summary(pull)}
|
110
|
+
|
111
|
+
#{pull[:body]}
|
112
|
+
EOS
|
113
|
+
GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape commit_message}"
|
109
114
|
|
110
115
|
# Print a log of the merge with branch structure visible. Jump through hoops to
|
111
116
|
# get the right branch to start the log revision range with. If origin/develop
|
data/lib/git_pr/version.rb
CHANGED
metadata
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: git_pr
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.0.
|
4
|
+
version: 0.0.13.beta.1
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Brian Sharon
|
@@ -159,9 +159,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
|
|
159
159
|
version: '0'
|
160
160
|
required_rubygems_version: !ruby/object:Gem::Requirement
|
161
161
|
requirements:
|
162
|
-
- - '
|
162
|
+
- - '>'
|
163
163
|
- !ruby/object:Gem::Version
|
164
|
-
version:
|
164
|
+
version: 1.3.1
|
165
165
|
requirements: []
|
166
166
|
rubyforge_project:
|
167
167
|
rubygems_version: 2.0.14
|