change the order of arguments to send_email

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index ca55e9fd871202ebf873ae55500de75db6010dfa..4b9be3adcb2aa61b3045e61e81933036daf3a29f 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,12 +36,9 @@ execute git merge --no-ff akpm-current/current || {
        echo Merge failed 1>&2
        echo $h >>../merge.debug
        git diff >>../merge.debug 2>&1
-       um_files=$(git diff 2>&1 | sed -n 's/^\* Unmerged path //p')
-       [ "$um_files" ] && [ -f "../merge-files/akpm-current" ] && {
-               rm_files=$(grep -F "$um_files" "../merge-files/akpm-current")
-               [ "$rm_files" ] &&
-                       "$bin_dir/do_rm" $rm_files
-       }
+
+       check_unmerged_files akpm-current
+
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }
@@ -89,8 +86,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
-notify-send "Waiting for akpm fix up"
-pushover "Waiting for akpm fix up"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd