Mod git pull

this works for git pull since Git 2.15
This commit is contained in:
Simon De Backer
2020-11-13 18:51:30 +01:00
parent 0bfbc37bc9
commit f613f7fcdc
3 changed files with 4 additions and 21 deletions

View File

@@ -9,13 +9,8 @@ git reset --hard origin/master
cd ..
# get updates
echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m"
read a
if [[ $a == "Y" || $a == "y" ]]; then
git submodule update --init --recursive
else
git pull
fi
git pull --recurse-submodules
sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro
GITCOMMIT=$(git rev-parse --short HEAD)

View File

@@ -12,13 +12,7 @@ SSH_OPTIONS=-B
cd $DEFAULT_DIR
cd qet_git
# get updates
echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m"
read a
if [[ $a == "Y" || $a == "y" ]]; then
git submodule update --init --recursive
else
git pull
fi
git pull --recurse-submodules
GITCOMMIT=$(git rev-parse --short HEAD)

View File

@@ -10,13 +10,7 @@ git reset --hard origin/master
cd ..
# get updates
echo -e "\033[1;31m uses the repo submodule (note not yet) n/Y?.\033[m"
read a
if [[ $a == "Y" || $a == "y" ]]; then
git submodule update --init --recursive
else
git pull
fi
git pull --recurse-submodules
sed -i 's/DEFINES += QET_EXPORT_PROJECT_DB/#DEFINES += QET_EXPORT_PROJECT_DB/' qelectrotech.pro