remove the use of refs/next

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 7d2c5136989325c5d024fa3889f9c21112574fe9..d1e7890c8b16dfb70b1d0af4483e85f98f4614e9 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -22,9 +22,6 @@ echo 'Trees included into this release:
 Name           Type    URL
 ----           ----    ---' > Next/Trees
 
-echo 'Name             SHA1
-----           ----' > Next/SHA1s
-
 IFS='  '
 while read email type name url ref build; do
        [[ "$email" =~ '^#.*$' ]] && continue
@@ -33,9 +30,10 @@ while read email type name url ref build; do
        [ "${ref%:*}" = "${ref}" ] || ref=${ref##*:}
        [ "$type" = "git" ] && url="$url#$ref"
        printf "%s$tab%s\t%s\n" $name $type $url
-       printf "%s$tab%s\n" $name $(git show-ref --verify --hash "refs/next/$d/$name") >> Next/SHA1s
 done <../real_control >>Next/Trees
 
+mv ../SHA1s Next/SHA1s
+
 for i in quilt-import.log merge.log; do
        grep -v '^Checking out files:' ../$i >Next/$i
 done
@@ -53,7 +51,7 @@ git diff-tree -p "$l.." >"../$p"
 gpg2 -u 41D5C07A -a -b "../$p"
 #echo "$l" > "../LATEST-IS-$n"
 
-../tools/make_abat_scripts "$d" "$l"
+$(dirname $0)/make_abat_scripts "$d" "$l"
 
 echo Pushing to korg ...
 git push korg