git_pr 0.0.5 → 0.0.6
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/lib/git_pr/merge.rb +4 -4
- data/lib/git_pr/version.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: 7968f62060b92b884f997995272104332c1030e7
|
|
4
|
+
data.tar.gz: 71f6a543bb64d27d0f938a695997ee3492d91629
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: f820bb0fe822c56a9ee7c4545ec48c0e35639830f1e50d7d50a7ea3554a878611490c74f2fc491d176f8abec409207c5659a2eb822ba3e4468b62586ca408dbf
|
|
7
|
+
data.tar.gz: f87879e59f11b490d89c360589ec0fb47f096b48003137593441be80bf4fb4c3be1f8e4da3af33b5727b99c3e1c4cf114c21c64d203ff2a4d0ac33b8f0ca46ba
|
data/lib/git_pr/merge.rb
CHANGED
|
@@ -3,13 +3,13 @@ module GitPr
|
|
|
3
3
|
def self.ensure_remotes_for_pull_request git, pull
|
|
4
4
|
source_remote = GitPr.ensure_remote_for_project(git,
|
|
5
5
|
pull[:head][:user][:login],
|
|
6
|
-
pull[:head][:repo][:
|
|
7
|
-
pull[:head][:repo][:
|
|
6
|
+
pull[:head][:repo][:ssh_url],
|
|
7
|
+
pull[:head][:repo][:git_url])
|
|
8
8
|
|
|
9
9
|
target_remote = GitPr.ensure_remote_for_project(git,
|
|
10
10
|
pull[:base][:user][:login],
|
|
11
|
-
pull[:base][:repo][:
|
|
12
|
-
pull[:base][:repo][:
|
|
11
|
+
pull[:base][:repo][:ssh_url],
|
|
12
|
+
pull[:base][:repo][:git_url])
|
|
13
13
|
|
|
14
14
|
[source_remote, target_remote]
|
|
15
15
|
end
|
data/lib/git_pr/version.rb
CHANGED