[Mesa-dev] [PATCH 2/6] bin/get-extra-pick-list: rework to use already_picked list
emil.l.velikov at gmail.com
Mon Feb 13 13:39:57 UTC 2017
From: Emil Velikov <emil.velikov at collabora.com>
Currently we loop (git log --grep) to check if the fix has landed. We
can simplify and make things faster by storing the already_picked list
and grep ping through it.
Slim down the message while we're here.
Cc: "13.0 17.0" <mesa-stable at lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
bin/get-extra-pick-list.sh | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
index f292d3ec8b..4d3938931f 100755
@@ -15,20 +15,23 @@ latest_branchpoint=`git merge-base origin/master HEAD`
# Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" $latest_branchpoint..HEAD |\
grep "cherry picked from commit" |\
- sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' |\
- cut -c -8 |\
+ sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
+# For each cherry-picked commit...
+cat already_picked | cut -c -8 |\
while read sha
- # Check if the original commit is referenced in master
+ # ... check if it's referenced (fixed by another) patch
git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
cut -c -8 |\
while read candidate
- # Check if the potential fix, hasn't landed in branch yet.
- found=`git log -n1 --pretty=oneline --reverse --grep=$candidate $latest_branchpoint..HEAD |wc -l`
- if test $found = 0
- echo Commit $candidate might need to be picked, as it references $sha
+ # And flag up if it hasn't landed in branch yet.
+ if grep -q ^$candidate already_picked ; then
+ echo Commit $candidate references $sha
+rm -f already_picked
More information about the mesa-dev