TkgThingy: Make sure we are on the master branch before pulling
This prevents merging to a detached head case
This commit is contained in:
parent
350107f9ea
commit
11a031af38
@ -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
|
||||
|
Loading…
Reference in New Issue
Block a user