- [ "$f" = "origin.patch" ] && continue
- [ "$f" = "linux-next.patch" ] && {
- git branch current
- execute git merge --no-edit --no-stat "$nbase"
- git branch master-base
- continue
- }
- execute git am --patch-format=mbox "$mmotm/broken-out/$f"
+ case "$f" in
+ origin.patch)
+ ;;
+ linux-next.patch)
+ execute git branch tmp-akpm/current ||
+ $SHELL -i || exit
+ execute git merge --no-edit --no-stat "$dnb" || {
+ check_unmerged_files akpm-current
+
+ git diff 2>&1 | grep -E -q '<<<<<|^\*' && {
+ $SHELL -i || exit
+ }
+ GIT_EDITOR=: execute git commit -v -a
+ }
+ [ -f "../merge-fixes/akpm-current" ] && {
+ for p in $(cat "../merge-fixes/akpm-current"); do
+ $(dirname $0)/merge_fix -n "$p" ||
+ $SHELL -i || exit
+ done
+ }
+ execute git branch tmp-akpm/master-base ||
+ $SHELL -i || exit
+ ;;
+ *)
+ execute git am -s --patch-format=mbox "$mmotm/broken-out/$f" ||
+ $SHELL -i || exit
+ ;;
+ esac