From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 4 Feb 2013 23:59:45 +0000 (+1100)
Subject: merge_akpm: rationalise a bit
X-Git-Url: http://git.ozlabs.org/?a=commitdiff_plain;h=5287ecaae04ada496f506ee2dfbd3af12e6c38ba;p=next-scripts

merge_akpm: rationalise a bit
---

diff --git a/merge_akpm b/merge_akpm
index 06489d4..2c9ff50 100755
--- 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