remove the use of refs/next

[next-scripts] / merge_akpm

diff --git a/merge_akpm b/merge_akpm
index 2c9ff502b12f886d45fd1be48edfd3f8deb97090..b414a0329f200b9e66dee8a064d2b3b223777b1a 100755 (executable)
--- a/merge_akpm
+++ b/merge_akpm
@@ -1,6 +1,7 @@
 #!/bin/bash
 
 LOG_FILE="../merge.log"
+SHA1_FILE="../SHA1s"
 build_host="ka2"
 build_dir="/scratch/sfr/next"
 build_cmd="bin/build_next"
@@ -38,7 +39,6 @@ execute()
 
 cpwd=../next
 
-git update-ref "refs/next/$today/akpm-current" akpm/current
 git branch -f akpm-current/current akpm/current
 
 git branch -f akpm/base HEAD
@@ -55,6 +55,7 @@ execute git merge akpm-current/current || {
        GIT_EDITOR=: execute git commit -v -a
        execute git diff -M --stat --summary 'HEAD^..'
 }
+printf "%s\t%s\n" akpm-current $(git show-ref --hash akpm-current/current) >> $SHA1_FILE
 
 execute git clone -s -l -n -q . ../rebase-tmp || {
        echo Clone failed 1>&2
@@ -80,8 +81,6 @@ execute git fetch -f ../rebase-tmp akpm:akpm/master || {
 }
 execute rm -rf ../rebase-tmp
 
-git update-ref "refs/next/$today/akpm" akpm/master
-
 git branch -f akpm/master-base HEAD
 
 log Merging akpm/master '('$(git log -1 --oneline akpm/master)')'
@@ -89,6 +88,7 @@ execute git merge --no-ff akpm/master || {
        echo Merge failed 1>&2
        bash -i || exit
 }
+printf "%s\t\t%s\n" akpm $(git show-ref --hash akpm/master) >> $SHA1_FILE
 
 [ -f "../merge-fixes/akpm" ] && {
        for p in $(cat "../merge-fixes/akpm"); do