Commit fccf8ca2 authored by Evan Hunt's avatar Evan Hunt
Browse files

updated branchsync to deal with merge commits

parent 3baf604b
......@@ -119,10 +119,14 @@ if [ -z "$continuing" ]; then
# loop through commits looking for ones that should be cherry-picked
git log $SOURCEBRANCH --reverse --format='%H %aN' $LASTHASH..$SOURCEBRANCH | \
git log $SOURCEBRANCH --first-parent --reverse --format='%H %aN' $LASTHASH..$SOURCEBRANCH | \
awk '$0 !~ /Tinderbox/ {print $1}' | {
while read hash; do
if git cherry-pick -xn ${hash}; then
if [ `git cat-file -p ${hash} | grep '^parent [0-9a-f][0-9a-f]*$' | wc -l` -gt 1 ]; then
mainline="-m 1 "
if git cherry-pick ${mainline} -xn ${hash}; then
# cherry-pick was clean
# restore the files that we don't want updated automatically
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment