From 11a031af38635024e1dd46171da29f7eab1ba115 Mon Sep 17 00:00:00 2001
From: Tk-Glitch <ti3nou@gmail.com>
Date: Thu, 3 Sep 2020 13:16:36 +0200
Subject: [PATCH] TkgThingy: Make sure we are on the master branch before
 pulling

This prevents merging to a detached head case
---
 TkgThingy | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/TkgThingy b/TkgThingy
index 509c1e0..16d12a9 100755
--- a/TkgThingy
+++ b/TkgThingy
@@ -139,7 +139,7 @@ _main_loop() {
         #git submodule update --remote
         for _tkg_tools in */; do
           if [ "$_tkg_tools" != ".git" ]; then
-            ( cd "$_tkg_tools" && git config pull.rebase false && git pull origin master )
+            ( cd "$_tkg_tools" && git config pull.rebase false && git checkout master && git pull origin master )
           fi
         done
     elif [ "$_choice" == "3" ]; then