From 8fc7fbdd45f517cf1c548695f975aa1f6c2ed493 Mon Sep 17 00:00:00 2001 From: Stephen Rothwell Date: Fri, 13 Mar 2009 15:39:45 +1100 Subject: [PATCH] separate out creation of ABAT scripts cope with using old version of some trees clean the logs while importing them --- make_tree_file | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/make_tree_file b/make_tree_file index d3da8a6..030a26a 100755 --- a/make_tree_file +++ b/make_tree_file @@ -7,6 +7,9 @@ h=$(date '+%H') exit 1 } +# This means I get the right tag if I finish after midnight +d=$(date --date "5 hours ago" '+%Y%m%d') + mkdir Next echo 'Trees included into this release: @@ -26,13 +29,12 @@ 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 $href) >> Next/SHA1s + printf "%s$tab%s\n" $name $(git rev-parse --verify "next-$d/$name") >> Next/SHA1s done <../real_control >>Next/Trees -cp ../quilt-import.log ../merge.log Next/. - -# This means I get the right tag if I finish after midnight -d=$(date --date "5 hours ago" '+%Y%m%d') +for i in quilt-import.log merge.log; do + grep -v '^Checking out files:' ../$i >Next/$i +done printf -- "-next-%s\n" $d >localversion-next @@ -45,14 +47,6 @@ git update-ref refs/heads/stable refs/remotes/origin/master new_ref=$(echo "next-$d" | git commit-tree 'HEAD^{tree}' -p history -p HEAD) git update-ref -m "next-$d" refs/heads/history $new_ref -cat >../abat-script-$d <