check_fixes: consolidate matching

[next-scripts] / make_tree_file

diff --git a/make_tree_file b/make_tree_file
index 5a8248273f56c6f7e92780892cace033f8489a12..66373bfcea5b69f75d6d8d4743966328af361e19 100755 (executable)
--- a/make_tree_file
+++ b/make_tree_file
@@ -9,10 +9,8 @@ h=$(date '+%k')
        exit 1
 }
 
-if ! ssh git@gitolite.kernel.org 2fa isval; then
-       read -r -p "Yubikey token: " tok
-       ssh git@gitolite.kernel.org 2fa val $tok
-fi
+read -r -p "Yubikey token: " tok
+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')
@@ -32,6 +30,7 @@ mkdir Next
        IFS='   '
        grep -v '^#' $CTRL_FILE |
                while read email type name url ref build; do
+                       [ "$type" = "branch" ] && continue
                        tab="\t"
                        [ ${#name} -le 8 ] && tab="\t\t"
                        [ "$type" = "git" ] && url="$url#${ref##*:}"
@@ -55,7 +54,7 @@ git branch -f stable refs/remotes/origin/master
 
 p="patch-$l-$n"
 git diff-tree -p "$l.." >"../$p"
-gpg -u $gpg_key -a -b "../$p"
+gpg -u $kup_gpg_key -a -b "../$p"
 
 oldest=$(date --date "3 months ago" '+%Y%m%d')
 echo "Removing old releases ... <= next-$oldest"
@@ -79,4 +78,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