X-Git-Url: http://git.ozlabs.org/?a=blobdiff_plain;f=make_tree_file;h=75614f6bb80595c39b1944d1ca14e4f84f2985f0;hb=HEAD;hp=c144ccc59980e77fe6505b767300a1aa06bc0c6f;hpb=a16f3bdd0f860b9fc418f6f42b1244e2350a4a00;p=next-scripts diff --git a/make_tree_file b/make_tree_file index c144ccc..75614f6 100755 --- a/make_tree_file +++ b/make_tree_file @@ -14,7 +14,7 @@ ssh git@gitolite.kernel.org 2fa val-session $tok # This means I get the right tag if I finish after midnight d=$(date --date "5 hours ago" '+%Y%m%d') -l="$(git describe --match "v*" --abbrev=0)" +l=$(git tag -l --sort=taggerdate 'v*' | tail -n 1) n="next-$d" mkdir Next @@ -32,7 +32,7 @@ mkdir Next while read email type name url ref build; do [ "$type" = "branch" ] && continue tab="\t" - [ ${#name} -le 8 ] && tab="\t\t" + [ ${#name} -lt 8 ] && tab="\t\t" [ "$type" = "git" ] && url="$url#${ref##*:}" printf "%s$tab%s\t%s\n" $name $type $url done @@ -40,9 +40,7 @@ mkdir Next mv ../SHA1s Next/SHA1s -for i in quilt-import.log merge.log; do - grep -v '^Checking out files:' ../$i >Next/$i -done +grep -v '^Checking out files:' ../merge.log >Next/merge.log printf -- "-next-%s\n" $d >localversion-next @@ -78,4 +76,6 @@ cd .. xz -v -9 "$p" kup put "$p.xz" "$p.asc" "/pub/linux/kernel/next/$p.gz" +ssh -O exit git@gitolite.kernel.org + exit 0