resolve issue #33

Author: jtarchie

Diff for: assets/lib/in.rb

@@ -23,7 +23,7 @@ def remote_ref
 
 pr = Octokit.pull_request(input['source']['repo'], input['version']['pr'])
 id = pr['number']
-branch_ref = pr['head']['ref']
+branch_ref = "pr-#{pr['head']['ref']}"
 
 raise 'PR has merge conflicts' if pr['mergeable'] == false && params['fetch_merge']
 
@@ -37,7 +37,7 @@ def remote_ref
   system("git checkout #{branch_ref} 1>&2")
   system("git config --add pullrequest.url #{pr['html_url']} 1>&2")
   system("git config --add pullrequest.id #{pr['number']} 1>&2")
-  system("git config --add pullrequest.branch #{branch_ref} 1>&2")
+  system("git config --add pullrequest.branch #{pr['head']['ref']} 1>&2")
 end
 
 puts JSON.generate(version:  { ref: ref, pr: id.to_s },

Diff for: spec/integration/check_spec.rb

@@ -80,10 +80,10 @@
 
       before do
         proxy.stub('https://api.github.com:443/repos/jtarchie/test/pulls?direction=asc&per_page=100&sort=updated&state=open')
-          .and_return(json: [
-        { number: 1, head: { sha: 'abcdef' } },
-        { number: 2, head: { sha: 'zyxwvu' } }
-        ])
+             .and_return(json: [
+                           { number: 1, head: { sha: 'abcdef' } },
+                           { number: 2, head: { sha: 'zyxwvu' } }
+                         ])
       end
 
       it 'returns all PRs oldest to newest last' do

Diff for: spec/integration/in_spec.rb

@@ -26,6 +26,7 @@ def commit(msg)
     commit('second')
 
     git("update-ref refs/pull/1/head #{@ref}")
+    git("update-ref refs/pull/1/merge #{@ref}")
   end
 
   context 'for every PR that is checked out' do
@@ -55,11 +56,11 @@ def commit(msg)
       expect(value).to eq 'http://example.com'
     end
 
-    it 'checks out as a branch' do
+    it 'checks out as a branch with a `pr-` prefix' do
       get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' })
 
       value = git('rev-parse --abbrev-ref HEAD', dest_dir)
-      expect(value).to eq 'foo'
+      expect(value).to eq 'pr-foo'
     end
 
     it 'sets config variable to branch name' do
@@ -92,7 +93,15 @@ def commit(msg)
         get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' }, params: { fetch_merge: false })
 
         value = git('rev-parse --abbrev-ref HEAD', dest_dir)
-        expect(value).to eq 'foo'
+        expect(value).to eq 'pr-foo'
+      end
+
+      it 'does not fail cloning' do
+        proxy.stub('https://api.github.com:443/repos/jtarchie/test/pulls/1')
+             .and_return(json: { html_url: 'http://example.com', number: 1, head: { ref: 'foo' }, mergeable: true })
+
+        _, error = get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' }, params: { fetch_merge: false })
+        expect(error).not_to include 'git clone failed'
       end
     end
 
@@ -104,7 +113,15 @@ def commit(msg)
         get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' }, params: { fetch_merge: true })
 
         value = git('rev-parse --abbrev-ref HEAD', dest_dir)
-        expect(value).to eq 'master'
+        expect(value).to eq 'pr-foo'
+      end
+
+      it 'does not fail cloning' do
+        proxy.stub('https://api.github.com:443/repos/jtarchie/test/pulls/1')
+             .and_return(json: { html_url: 'http://example.com', number: 1, head: { ref: 'foo' }, mergeable: true })
+
+        _, error = get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' }, params: { fetch_merge: true })
+        expect(error).not_to include 'git clone failed'
       end
     end
   end