rationalise akpm related branches

use ssh-agent

diff --git a/make_tree_file b/make_tree_file
index addcb1e4ad07b54dba59b9195ae70d2e42c83a3b..2fed5201d2f9a8197ced6ca20c8e692f33fde9fd 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -7,7 +7,8 @@ h=$(date '+%H')
        exit 1
 }
 
-#git update-ref refs/heads/akpm-end refs/heads/master
+eval $(ssh-agent -s)
+ssh-add ~/.ssh/ra.kernel.org
 
 # This means I get the right tag if I finish after midnight
 d=$(date --date "5 hours ago" '+%Y%m%d')
@@ -46,7 +47,6 @@ git commit -s -v -a -m "Add linux-next specific files for $d"
 git tag -u 41D5C07A -m "$n" "$n"
 
 git update-ref refs/heads/stable refs/remotes/origin/master
-git update-ref refs/heads/akpm-start refs/remotes/origin/master
 
 p="patch-$l-$n"
 git diff-tree -p "$l.." >"../$p"
@@ -69,4 +69,6 @@ cd ..
 xz -v -9 "$p"
 kup --host=geb.kernel.org put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz"
 
+ssh-agent -k
+
 exit 0

diff --git a/merge_akpm b/merge_akpm
index f265e25997d30a47faf763ea3d8b23de564ae845..a8099e4fc1492fb38240443bba666a289bbff295 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -64,19 +64,17 @@ echo "fix up? use git rebase -i --onto master akpm-base"
 bash -i
 log '$' cd $cpwd
 cd $cpwd
-execute git fetch -f ../rebase-tmp akpm:akpm || {
+execute git fetch -f ../rebase-tmp akpm:quilt/akpm || {
        echo Pull failed 1>&2
        bash -i || exit
 }
 execute rm -rf ../rebase-tmp
 
-git update-ref "refs/next/$today/akpm" akpm
-git update-ref refs/heads/akpm-end HEAD
-git update-ref refs/heads/quilt/akpm refs/heads/akpm
-git update-ref refs/heads/quilt/akpm-base refs/heads/akpm-end
+git update-ref "refs/next/$today/akpm" quilt/akpm
+git update-ref refs/heads/quilt/akpm-base HEAD
 
-log Merging akpm '('$(git log -1 --oneline akpm)')'
-execute git merge --no-ff akpm || {
+log Merging quilt/akpm '('$(git log -1 --oneline quilt/akpm)')'
+execute git merge --no-ff quilt/akpm || {
        echo Merge failed 1>&2
        bash -i || exit
 }
@@ -104,4 +102,3 @@ ssh "$build_host" "$build_cmd" || {
 }
 
 exit 0
-