mesa; add get-extra-pick-list.sh script into bin/
authorEmil Velikov <emil.l.velikov@gmail.com>
Wed, 2 Sep 2015 16:36:22 +0000 (17:36 +0100)
committerEmil Velikov <emil.l.velikov@gmail.com>
Mon, 29 Feb 2016 11:25:35 +0000 (11:25 +0000)
This is a very rudimentary script that checks if any of the applied
cherry-picks have been referenced (fixed?) by another patch. With the
latter either missing the stable tag or hasn't yet been picked.

Cc: "11.1 11.2" <mesa-stable@lists.freedesktop.org>
Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
bin/get-extra-pick-list.sh [new file with mode: 0755]

diff --git a/bin/get-extra-pick-list.sh b/bin/get-extra-pick-list.sh
new file mode 100755 (executable)
index 0000000..a9d25b9
--- /dev/null
@@ -0,0 +1,35 @@
+#!/bin/sh
+
+# Script for generating a list of candidates which fix commits that have been
+# previously cherry-picked to a stable branch.
+#
+# Usage examples:
+#
+# $ bin/get-extra-pick-list.sh
+# $ bin/get-extra-pick-list.sh > picklist
+# $ bin/get-extra-pick-list.sh | tee picklist
+
+# Use the last branchpoint as our limit for the search
+# XXX: there should be a better way for this
+latest_branchpoint=`git branch | grep \* | cut -c 3-`-branchpoint
+
+# 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 |\
+while read sha
+do
+       # Check if the original commit is referenced in master
+       git log -n1 --pretty=oneline --grep=$sha $latest_branchpoint..origin/master |\
+               cut -c -8 |\
+       while read candidate
+       do
+               # 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
+               then
+                       echo Commit $candidate might need to be picked, as it references $sha
+               fi
+       done
+done