Mesa (staging/19.2): rehardcode from origin/master to upstream/master

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: b1ea3dcc1f0273eb0fa1371911cdfd6b807254f6
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b1ea3dcc1f0273eb0fa1371911cdfd6b807254f6

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Mon Sep 23 11:08:35 2019 -0700

rehardcode from origin/master to upstream/master

---

 bin/get-pick-list.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
index 8fa4f438771..ac631c9ae3d 100755
--- a/bin/get-pick-list.sh
+++ b/bin/get-pick-list.sh
@@ -92,7 +92,7 @@ is_revert_nomination()
 }
 
 # Use the last branchpoint as our limit for the search
-latest_branchpoint=`git merge-base origin/master HEAD`
+latest_branchpoint=`git merge-base upstream/master HEAD`
 
 # List all the commits between day 1 and the branch point...
 git log --reverse --pretty=%H $latest_branchpoint > already_landed
@@ -103,7 +103,7 @@ git log --reverse --pretty=medium --grep="cherry picked from commit" $latest_bra
 	sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
 
 # Grep for potential candidates
-git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..origin/master |\
+git log --reverse --pretty=%H -i --grep='^CC:.*mesa-stable\|^CC:.*mesa-dev\|\<fixes\>\|\<broken by\>\|This reverts commit' $latest_branchpoint..upstream/master |\
 while read sha
 do
 	# Check to see whether the patch is on the ignore list.