Handle VSO's pull requests. Need to check them out locally and they don't show up as a remote branch

Author: Oren Novotny

src/GitVersionVsoTask/Run-GitVersion.ps1

@@ -27,19 +27,36 @@ $loc = $($env:BUILD_SOURCESDIRECTORY)
 $branch = $($env:BUILD_SOURCEBRANCH)
 $commitId = $($env:BUILD_SOURCEVERSION)
 
-$localBranch = $branch.Trim().Replace("refs/heads/", "")
+$localBranch = $branch.Trim().Replace("refs/heads/", "").Replace("refs/","")
 
 Set-Location $loc
 
+$haveLocalBranch = $false
 # VSO checks out the commit as a detached HEAD
 # loop through and checkout all branches and the one we want
-# then reset hard to get to the desired commit id
+# then reset merge to get to the desired commit id
 foreach ($remoteBranch in . git branch -r) {
-  . git checkout $remoteBranch.Trim().Replace("origin/", "") 2>&1 | write-host
+  
+  $lb = $remoteBranch.Trim().Replace("origin/", "")
+  . git checkout $lb 2>&1 | write-host
 
+  # keep track of if we have a matching local branch
+  # pull requests will not show up here
+  if($lb -eq $localBranch) {
+     $haveLocalBranch = $true
+  }
 }  
-. git checkout $localBranch 2>&1 | write-host 
-. git reset --hard $commitId 2>&1 | write-host
+
+# if we have a local branch, check that out and set it at the right commit
+if($haveLocalBranch){
+  . git checkout $localBranch 2>&1 | write-host 
+  . git reset --merge $commitId 2>&1 | write-host
+} else {
+  # try to create a local branch from this commit - likely a PR
+  . git checkout -b $localBranch $commitId 2>&1 | write-host
+}
+
+
 
 # Call GitVersion.exe
 $gvPath = Get-PathToGitVersionExe

src/GitVersionVsoTask/task.json

@@ -14,7 +14,7 @@
   "version": {
     "Major": "0",
     "Minor": "1",
-    "Patch": "4"
+    "Patch": "29"
   },
   "minimumAgentVersion": "1.83.0",
   "groups": [