various updates

[next-scripts] / make_next_branches

diff --git a/make_next_branches b/make_next_branches
index de39d4bbf3719b0cad9a32bcb384b4b898d4edd2..314009a2e2bf288a1daef9cc9ad00a4e01e3e7a1 100755 (executable)
--- a/make_next_branches
+++ b/make_next_branches
@@ -4,19 +4,14 @@ dir=$1
 
 [ "$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); }')
+heads=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 
 for h in $heads; do
        tree=${h%%/*}
-       rem_ref=refs/remotes
-       [ "$tree" == "quilt" ] && {
-               tree=${h#quilt/}
-               rem_ref=refs/heads
-       }
        [ "${h%:*}" == "${h}" ] ||
                h="${tree}/${h##*:}"
 
-       git update-ref "refs/next/$dir/$tree" "$rem_ref/$h"
+       git update-ref "refs/next/$dir/$tree" "$h"
 done
 
 git pack-refs --all --prune