X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=4b9be3adcb2aa61b3045e61e81933036daf3a29f;hb=HEAD;hp=6f3f0705efd4b496f1abe26b0fef2ede82aa6c5e;hpb=d270a218b283d15bda88ffdd0ee662f3ab3d689e;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index 6f3f070..4b9be3a 100755
--- 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
 	}
@@ -64,11 +61,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
 	}
@@ -89,7 +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"
+linux-next-notify "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -123,11 +120,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
 	}