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.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/git_pr/merge.rb +6 -1
  3. data/lib/git_pr/version.rb +1 -1
  4. metadata +3 -3
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 4f0ab27aaf12b0313a7a4eb7f403733583817a13
4
- data.tar.gz: 8f4884c4c2b568bc474c9004de0ac301d9650df9
3
+ metadata.gz: 2cb9b6b023a2ac2b8f11dce7b92aec1b930b751a
4
+ data.tar.gz: c77bac089064b8f6b0ea371b88ec632b627ea84f
5
5
  SHA512:
6
- metadata.gz: 177b310e62d62e27f16254bca171c0445e862101c67a5bb1f7f02de26f130e7b19702a98802ab5270bc46977ca7d05af329763b93b76997699d2b67378b05227
7
- data.tar.gz: 3fec0aececf8aac2cb84914f6a8ef21399b6945de72fc4a5e81fe1f41675cd67d8205e771aec3804dc1b59dcb96d252ceddaa6502a8a95d1874328d152d55ac8
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
- GitPr.run_command "git merge --no-ff #{rebase_branch} -m #{Shellwords.escape("Merge " + pull_summary(pull))}"
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
@@ -1,3 +1,3 @@
1
1
  module GitPr
2
- VERSION = "0.0.12"
2
+ VERSION = "0.0.13.beta.1"
3
3
  end
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.12
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: '0'
164
+ version: 1.3.1
165
165
  requirements: []
166
166
  rubyforge_project:
167
167
  rubygems_version: 2.0.14