From a2a54e6d9e7fee58bd26da3dceb15689db558eec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakobus=20Sch=C3=BCrz?= <jakobus.schuerz@schuerz.at>
Date: Wed, 15 Sep 2021 13:55:20 +0200
Subject: [PATCH] transfer function to shellscript

---
 bin/git-mergedetachedheadtomaster |  7 +++++++
 functions.sh                      | 23 +++++++++++++----------
 2 files changed, 20 insertions(+), 10 deletions(-)
 create mode 100644 bin/git-mergedetachedheadtomaster

diff --git a/bin/git-mergedetachedheadtomaster b/bin/git-mergedetachedheadtomaster
new file mode 100644
index 0000000..a721473
--- /dev/null
+++ b/bin/git-mergedetachedheadtomaster
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+git checkout -b tmp
+git branch -f master tmp
+git checkout master
+git branch -d tmp
+git commit -m "Merged detached head into master" .
diff --git a/functions.sh b/functions.sh
index 7b9ca7e..f29cb6d 100755
--- a/functions.sh
+++ b/functions.sh
@@ -279,16 +279,17 @@ unsetproxy () {
     EXIT
 }
 
-git-mergedetachedheadtomaster () {
-    ENTRY
-    git checkout -b tmp
-    git branch -f master tmp
-    git checkout master
-    git branch -d tmp
-    git commit -m "Merged detached head into master" .
-    #git push origin master
-    EXIT
-}
+# transfered to bin
+#git-mergedetachedheadtomaster () {
+#    ENTRY
+#    git checkout -b tmp
+#    git branch -f master tmp
+#    git checkout master
+#    git branch -d tmp
+#    git commit -m "Merged detached head into master" .
+#    #git push origin master
+#    EXIT
+#}
 
 pathmunge () {
     ENTRY
@@ -835,6 +836,7 @@ token(){
     [ -z "${P11M:+x}" ] && { P11M=$PKCS11_MODULE; export P11M; }
 
     tmppubkey="${XDG_RUNTIME_DIR}/token.pub"
+    # Write public keys of all in agent stored keys to a temporary file
     loginfo "$(ssh-add -L > $tmppubkey)"
 
     # Usage:
@@ -842,6 +844,7 @@ token(){
     #   token -r|-f|--reload-token <identity>   will remove token from agent and add it again (if plugged off and plugged in again
 #    startagent -t $@
 #    loadagent $@
+    # Check if public-keys in tmppubkey are working. They are not working, if you removed and add back hardware-token. 
     loginfo "$(ssh-add -T ${tmppubkey} || { ssh-add -e $P11M; ssh-add -s $P11M; } )"
     loginfo "$(ssh-add -l)"