summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xbin/get-pick-list.sh21
1 files changed, 21 insertions, 0 deletions
diff --git a/bin/get-pick-list.sh b/bin/get-pick-list.sh
new file mode 100755
index 0000000..aae8fd5
--- /dev/null
+++ b/bin/get-pick-list.sh
@@ -0,0 +1,21 @@
+#!/bin/sh
+
+git log --reverse --pretty=oneline HEAD..origin/master | cut -d' ' -f1 |\
+while read sha
+do
+ # Check to see whether the patch was marked as a candidate for the stable tree.
+ if git log -n1 $sha | grep -iq '^[[:space:]]*NOTE: This is a candidate' ; then
+ if [ -f .git/cherry-ignore ] ; then
+ if grep -q ^$sha .git/cherry-ignore ; then
+ continue
+ fi
+ fi
+
+ # Check to see if it has already been picked over.
+ if git log origin/master..HEAD | grep -q "cherry picked from commit $sha"; then
+ continue
+ fi
+
+ git log -n1 --pretty=oneline $sha | cat
+ fi
+done