remove the use of refs/next

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 0a95322ea54acf6c2ae45afe9c97d3386af267f5..d5e1a084a700e3c238f91297040ccc932b52c7df 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -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"
@@ -99,6 +100,8 @@ do_rebase()
        execute date
        execute git checkout master
        execute git reset --hard stable
+       printf 'Name\t\tSHA1\n----\t\t----\n' > $SHA1_FILE
+
 }
 
 heads=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
@@ -146,6 +149,9 @@ for h in $heads; do
                        }
                done
        }
+       tab="\t"
+       [ $(echo "$tree" | wc -c) -le 8 ] && tab="\t\t"
+       printf "%s$tab%s\n" $tree $(git show-ref --hash "${h/\/*://}") >> $SHA1_FILE
        [ -x "../pre-build/$tree" ] && {
                "../pre-build/$tree" || bash -i || exit
        }