+ git merge --no-edit "$base"
+ if $compile;then
+ make
+ fi
+ if [ -e "$next".patch ];then
+ echo -e '/^--- /,$d\nw'|ed "$next".patch || :
+ fi
+ git diff "$base" "$next" --|diffdecvs >>"$next".patch
+ git diff -U9999999 --binary "$base" "$next" -- >"$next".Upatch
+ if $gerrit;then
+ cp "$next".patch dashtopatch.patch
+ echo -e '/^--- /,$d\nw'|ed dashtopatch.patch
+ git checkout gerrit
+ patch -p1 <"$next".patch
+ git commit -a -F dashtopatch.patch
+ rm -f dashtopatch.patch