git_pr 0.0.13 → 0.0.14.beta0
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 +7 -0
- data/lib/git_pr/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: e1a52c54177aa30fbf3c66ae58700877bc84c539
|
|
4
|
+
data.tar.gz: 11e1faab37fcddee44be6e33093832daa48a98d7
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 55b6ea86c912b8d15051f2cd32b01cdeb09c3068a40cdf0d0c8d579615581e35886f408f418e22f6e8f171a0968884fe4ed35048e0fe1c22a5078437b2b37916
|
|
7
|
+
data.tar.gz: 4028887f5b4262f19657edc05d4f483922505aad091b3a5b917808449f45472b69008c9b814c47cab9553c4721c17cdaed3e224a2f6f3000200d522eac6e1540
|
data/lib/git_pr/merge.rb
CHANGED
|
@@ -52,6 +52,13 @@ module GitPr
|
|
|
52
52
|
# If the local target branch differs from the remote target branch, they
|
|
53
53
|
# must be reconciled manually.
|
|
54
54
|
remote_target_branch = "#{target_remote}/#{target_branch}"
|
|
55
|
+
begin
|
|
56
|
+
git.diff("remotes/#{remote_target_branch}", target_branch).any?
|
|
57
|
+
rescue
|
|
58
|
+
puts "Error cracking diff:"
|
|
59
|
+
puts git.diff("remotes/#{remote_target_branch}", target_branch).to_s
|
|
60
|
+
raise
|
|
61
|
+
end
|
|
55
62
|
if git.diff("remotes/#{remote_target_branch}", target_branch).any?
|
|
56
63
|
puts "Local branch '#{target_branch}' differs from remote branch '#{remote_target_branch}'. Please reconcile before continuing.".red
|
|
57
64
|
exit -1
|
data/lib/git_pr/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
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.14.beta0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Brian Sharon
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2015-11-
|
|
11
|
+
date: 2015-11-14 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: colorize
|
|
@@ -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
|