merge_akpm: rationalise a bit

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index 2a50dcb3bce0f18a67705101aa8e7c0afabb4aeb..2c9ff502b12f886d45fd1be48edfd3f8deb97090 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -62,19 +62,11 @@ execute git clone -s -l -n -q . ../rebase-tmp || {
 }
 log '$' cd ../rebase-tmp
 cd ../rebase-tmp
-execute git fetch --no-tags $cpwd refs/heads/akpm/master:akpm || {
-       echo Fetch of akpm/master failed 1>&2
-       bash -i || exit
-}
-execute git fetch --no-tags $cpwd refs/heads/akpm/master-base:akpm-base || {
-       echo Fetch of akpm/master-base failed 1>&2
+execute git checkout -b akpm remotes/origin/akpm/master || {
+       echo Checkout of remotes/origin/akpm/master failed 1>&2
        bash -i || exit
 }
-execute git checkout akpm || {
-       echo Checkout of top failed 1>&2
-       bash -i || exit
-}
-execute git rebase --onto master akpm-base || {
+execute git rebase --onto master remotes/origin/akpm/master-base || {
        echo Rebase failed 1>&2
        bash -i || exit
 }
@@ -83,7 +75,7 @@ bash -i
 log '$' cd $cpwd
 cd $cpwd
 execute git fetch -f ../rebase-tmp akpm:akpm/master || {
-       echo Pull failed 1>&2
+       echo Fetch of akpm/master failed 1>&2
        bash -i || exit
 }
 execute rm -rf ../rebase-tmp
@@ -100,7 +92,7 @@ execute git merge --no-ff akpm/master || {
 
 [ -f "../merge-fixes/akpm" ] && {
        for p in $(cat "../merge-fixes/akpm"); do
-               ../tools/merge_fix -n "$p" || {
+               $(dirname $0)/merge_fix -n "$p" || {
                        bash -i || exit
                }
        done