Update because I moved the next refs

diff --git a/make_next_branches b/make_next_branches
index 9905760e3b867d58894768d59f375e2c5d58ce1d..daaf5c969ca1170f67c62d117d9b02423aa0992d 100755 (executable)
--- a/make_next_branches
+++ b/make_next_branches
@@ -2,7 +2,7 @@
 
 dir=$1
 
-[ "$dir" ] || dir="next-$(date '+%Y%m%d')"
+[ "$dir" ] || dir="$(date '+%Y%m%d')"
 
 heads=$(grep -v '^#' ../real_control | awk -F '        ' '$2=="quilt" { printf("quilt/%s ", $3); } $2=="git" { printf("%s/%s ", $3, $5); }')
 
@@ -14,7 +14,7 @@ for h in $heads; do
                rem_ref=refs/heads
        }
 
-       git update-ref "refs/heads/$dir/$tree" "$rem_ref/$h"
+       echo git update-ref "refs/next/$dir/$tree" "$rem_ref/$h"
 done
 
 exit 0

diff --git a/make_tree_file b/make_tree_file
index 030a26a9b3b34f8c37476aa0e9c8d946692e681c..fed4fd8b1746f1351dd333a23c0e31dcd59025a6 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -29,7 +29,7 @@ while read email type name url ref build; do
        printf "%s$tab%s\t%s\n" $name $type $url
        href="$name/$ref"
        [ "$type" = "quilt" ] && href="quilt/$name"
-       printf "%s$tab%s\n" $name $(git rev-parse --verify "next-$d/$name") >> Next/SHA1s
+       printf "%s$tab%s\n" $name $(git show-ref --verify --hash "refs/next/$d/$name") >> Next/SHA1s
 done <../real_control >>Next/Trees
 
 for i in quilt-import.log merge.log; do

diff --git a/merge_old_version b/merge_old_version
index b84bc0cdcac015233608dd31e78d638c9d42ddc4..3b7465ec8288c2ab92cf86a11be5f39dda9362db 100755 (executable)
--- a/merge_old_version
+++ b/merge_old_version
@@ -14,7 +14,7 @@ no_build=false
 tree=$1
 ver=$2
 
-rev=$(git rev-parse -verify "next-$ver/$tree")
+rev=$(git show-ref --verify --hash "refs/next/$ver/$tree")
 [ "$rev" ] || {
        echo "No such tree/date" 1>&2
        exit 1
@@ -39,14 +39,18 @@ GIT_EDITOR=: execute git reset --hard 'HEAD^' || {
        bash -i || exit
 }
 
-log Merging "next-$ver/$tree"
-execute git merge "next-$ver/$tree" || {
+log Merging "refs/next/$ver/$tree"
+execute git merge "refs/next/$ver/$tree" || {
        echo Merge failed 1>&2
        bash -i || exit
        GIT_EDITOR=: execute git commit -v -a
        execute git diff -M --stat --summary 'HEAD^..'
 }
 
+d=$(date --date "5 hours ago" '+%Y%m%d')
+git update-ref "refs/next/$d/broken/$tree" "refs/next/$d/$tree"
+git update-ref "refs/next/$d/$tree" "refs/next/$ver/$tree"
+
 $no_build && exit 0
 
 rsync -avH --exclude .git --delete . "$build_host":"$build_dir"/. || {
@@ -60,8 +64,4 @@ ssh "$build_host" "$build_cmd" || {
        bash -i || exit
 }
 
-d=$(date --date "5 hours ago" '+%Y%m%d')
-git update-ref "refs/heads/next-$d/broken/$tree" "refs/heads/next-$d/$tree"
-git update-ref "refs/heads/next-$d/$tree" "refs/heads/next-$ver/$tree"
-
 exit 0

diff --git a/summary b/summary
index 466c326e750ffe46acd0be06c9e60be6a71adba4..57911f1f8f8f04126136dc6ff08c9184ffb53356 100755 (executable)
--- a/summary
+++ b/summary
@@ -52,7 +52,7 @@ for t in $trees; do
                fi
        }
 
-       h="next-$d/$t"
+       h="refs/next/$d/$t"
        git rev-parse --verify "$h" >/dev/null 2>&1 ||
                continue