Save original branch name from PR to git config variable

bcutler-work · Thomas Osugi · commit 364d363c5f05 · 2016-05-25T11:01:11.000-06:00
Signed-off-by: Thomas Osugi &lt;tosugi@pivotal.io&gt;
diff --git a/assets/lib/in.rb b/assets/lib/in.rb
@@ -30,6 +30,7 @@ def ref
   system("git checkout pr-#{id} 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 #{pr['head']['ref']} 1>&2")
 end
 
 puts JSON.generate(version:  { ref: ref, pr: id.to_s },
diff --git a/spec/integration/in_spec.rb b/spec/integration/in_spec.rb
@@ -23,7 +23,7 @@ def commit(msg)
 
   before do
     proxy.stub('https://api.github.com:443/repos/jtarchie/test/pulls/1')
-         .and_return(json: { html_url: 'http://example.com', number: 1 })
+         .and_return(json: { html_url: 'http://example.com', number: 1, head: { ref: 'foo' } })
 
     git('init -q')
     @ref = commit('init')
@@ -60,6 +60,12 @@ def commit(msg)
     expect(value).to eq 'pr-1'
   end
 
+  it 'sets original branch ref' do
+    get(version: { ref: @ref, pr: '1' }, source: { uri: git_uri, repo: 'jtarchie/test' })
+    value = git('config pullrequest.branch', dest_dir)
+    expect(value).to eq 'foo'
+  end
+
   context 'when the git clone fails' do
     it 'provides a helpful erorr message' do
       _, error = get(version: { ref: @ref, pr: '1' }, source: { uri: 'invalid_git_uri', repo: 'jtarchie/test' })
