# Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
# Grep for commits with "cherry picked from commit" in the commit message.
git log --reverse --grep="cherry picked from commit" origin/master..HEAD |\
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
sed -e 's/^[[:space:]]*(cherry picked from commit[[:space:]]*//' -e 's/)//' > already_picked
# Grep for commits that were marked as a candidate for the stable tree.
- # Check to see whether the patch is on the ignore list.
- if [ -f .git/cherry-ignore ] ; then
- if grep -q ^$sha .git/cherry-ignore ; then
- continue
- fi
+ # Check to see whether the patch is on the ignore list.
+ if [ -f bin/.cherry-ignore ] ; then
+ if grep -q ^$sha bin/.cherry-ignore ; then
+ continue
+ fi