check_commits: check for unexpected files in commits

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index f7670dbcf1a6594488905294705a14771ec6bd7d..0c3684d74887a3e0ceb347faa0963755c3a9f424 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -36,6 +36,12 @@ 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
+       }
        git diff 2>&1 | egrep -q '<<<<<|^\*' && {
                bash -i || exit
        }
@@ -58,11 +64,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm-current || {
                echo Build failed 1>&2
                bash -i || exit
        }
@@ -83,7 +89,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
        bash -i || exit
 }
 echo "fix up?"
-notify-send "Waiting for akpm fix up"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -117,11 +123,11 @@ $no_build ||
        [ "$old_head" = "$new_head" ] ||
        [ "$(git diff ${old_head}.. | wc -c)" -eq 0 ] || {
 
-       git push -f "$build_host":"$build_dir" master:refs/heads/next || {
+       git push -f "${build_host}${build_host:+:}${build_dir}" master:refs/heads/next || {
                echo git push failed 1>&2
                bash -i || exit
        }
-       "$bin_dir/do_build" || {
+       "$bin_dir/do_build" akpm || {
                echo Build failed 1>&2
                bash -i || exit
        }