Commit a54c08c5 authored by Aral Balkan's avatar Aral Balkan

better/update now updates from latest changes from live. Closes #11.

parent 8e68f6f6
Pipeline #506 skipped
......@@ -221,8 +221,17 @@ processGenericHook(){
ensurePersonIsLoggedIn
createGlobals
branchName=$(runIn $contentDirectory "git branch | sed -n -e 's/^\* \(.*\)/\1/p'")
echo " · Updating branch ${branchName}"
runIn $contentDirectory "git pull live \"$branchName\""
echo " · Pulling latest changes from live and updating branch ${branchName}"
# runIn $contentDirectory "git pull live \"$branchName\""
if [ "$branchName" == "master" ]; then
echo " · Already in master, pulling from live."
runIn $contentDirectory "git pull live master"
else
runIn $contentDirectory "git checkout master"
runIn $contentDirectory "git pull live master"
runIn $contentDirectory "git checkout ${branchName}"
runIn $contentDirectory "git merge master"
fi
goodbye
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment