CCF_100/PKGBUILDS
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TkgThingy: Make sure we are on the master branch before pulling

Browse Source 
This prevents merging to a detached head case
This commit is contained in:
Tk-Glitch
2020-09-03 13:16:36 +02:00
parent 350107f9ea
commit 11a031af38
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
TkgThingy
View File

@@ -139,7 +139,7 @@ _main_loop() {
#git submodule update --remote #git submodule update --remote
for _tkg_tools in */; do for _tkg_tools in */; do
if [ "$_tkg_tools" != ".git" ]; then 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 fi
done done
elif [ "$_choice" == "3" ]; then elif [ "$_choice" == "3" ]; then