From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 3 Oct 2019 03:32:44 +0000 (+1000)
Subject: add push-pending-fixes and notify when the branch is updated
X-Git-Url: https://git.ozlabs.org/?a=commitdiff_plain;h=ef732fb5e3660a47be15001885bb45d9852f9045;p=next-scripts

add push-pending-fixes and notify when the branch is updated
---

diff --git a/do_merge b/do_merge
index 2e3cf9c..b0caba0 100755
--- a/do_merge
+++ b/do_merge
@@ -74,6 +74,7 @@ for h in $heads; do
 
 	if [ "$tree" = "branch" ]; then
 		git branch -f "${h#branch/}"
+		linux-next-notify "update branch $1"
 		continue
 	fi
 
diff --git a/push-pending-fixes b/push-pending-fixes
new file mode 100755
index 0000000..9ed5ab9
--- /dev/null
+++ b/push-pending-fixes
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+read -r -p "Yubikey token: " tok
+# shellcheck disable=SC2029
+ssh git@gitolite.kernel.org 2fa val-session "$tok"
+
+git push -f korg refs/heads/pending-fixes:refs/heads/pending-fixes
+
+ssh -O exit git@gitolite.kernel.org
+
+exit 0