check_commits: speed up somewhat and produce usable output

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index 255b767c7067f7264716aa17ed211638aa733ae5..ca55e9fd871202ebf873ae55500de75db6010dfa 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,6 +89,8 @@ 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"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -116,11 +124,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
        }