diff options
| -rw-r--r-- | bin/.cherry-ignore | 2 | ||||
| -rwxr-xr-x | bin/get-pick-list.sh | 4 |
2 files changed, 4 insertions, 2 deletions
diff --git a/bin/.cherry-ignore b/bin/.cherry-ignore new file mode 100644 index 00000000000..9071a9a3b86 --- /dev/null +++ b/bin/.cherry-ignore @@ -0,0 +1,2 @@ +# This is reverted shortly after landing +4432a2d14d80081d062f7939a950d65ea3a16eed diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh index 40a1388f96c..9cbef061731 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. |