X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=merge_akpm;h=f7670dbcf1a6594488905294705a14771ec6bd7d;hb=effc2cae2d3f;hp=dc8a88c232532ed717cb9cd7704174fcc71e600e;hpb=2e06b9fa1987fc605256698a9243fd6f3b50d25b;p=next-scripts

diff --git a/merge_akpm b/merge_akpm
index dc8a88c..f7670db 100755
--- a/merge_akpm
+++ b/merge_akpm
@@ -32,7 +32,7 @@ git branch -f akpm/base HEAD
 old_head=$(git rev-parse HEAD)
 hlog=$(git log -1 --oneline akpm-current/current) 2>/dev/null
 log Merging akpm-current/current "($hlog)"
-execute git merge akpm-current/current || {
+execute git merge --no-ff akpm-current/current || {
 	echo Merge failed 1>&2
 	echo $h >>../merge.debug
 	git diff >>../merge.debug 2>&1
@@ -51,9 +51,6 @@ printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $S
 		}
 	done
 }
-[ -x "../pre-build/akpm-current" ] && {
-	"../pre-build/akpm-current" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)
 
@@ -86,6 +83,7 @@ execute git rebase --onto master remotes/origin/akpm/master-base || {
 	bash -i || exit
 }
 echo "fix up?"
+notify-send "Waiting for akpm fix up"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
@@ -112,9 +110,6 @@ printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
 		}
 	done
 }
-[ -x "../pre-build/akpm" ] && {
-	"../pre-build/akpm" || bash -i || exit
-}
 
 new_head=$(git rev-parse HEAD)