From 1cfc81d527d25b1399f1f5c81e53abf609e25b07 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 27 Aug 2014 14:43:22 +1000
Subject: [PATCH] make_tree_file: add 2fa for gitolite.kernel.org

also correct hour for hour < 10
---
 make_tree_file | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/make_tree_file b/make_tree_file
index 3881959..1e4e39b 100755
--- a/make_tree_file
+++ b/make_tree_file
@@ -3,7 +3,7 @@
 . "$(dirname $0)/common.sh"
 
 # Don't do releases in the wee hours :-)
-h=$(date '+%H')
+h=$(date '+%k')
 (( "$h" < 10 && "$h" > 4 )) && {
 	echo "Go back to bed" 1>&2
 	exit 1
@@ -12,6 +12,11 @@ h=$(date '+%H')
 eval $(gpg-agent --daemon --enable-ssh-support)
 ssh-add ~/.ssh/ra.kernel.org
 
+if ! ssh git@gitolite.kernel.org 2fa isval; then
+	read -r -p "Yubikey token: " tok
+	ssh git@gitolite.kernel.org 2fa val $tok
+fi
+
 # 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)"
-- 
2.39.5