2019-10-13 14:36:36 +00:00
|
|
|
#!/bin/sh
|
|
|
|
|
|
2019-10-13 15:28:52 +00:00
|
|
|
cd /var/www/anthony-dumas
|
2019-10-13 15:44:46 +00:00
|
|
|
git fetch
|
2019-10-13 15:28:52 +00:00
|
|
|
|
2019-10-13 14:36:36 +00:00
|
|
|
UPSTREAM=${1:-'@{u}'}
|
|
|
|
|
LOCAL=$(git rev-parse @)
|
|
|
|
|
REMOTE=$(git rev-parse "$UPSTREAM")
|
|
|
|
|
BASE=$(git merge-base @ "$UPSTREAM")
|
|
|
|
|
|
2019-10-13 15:41:29 +00:00
|
|
|
if [ $LOCAL = $REMOTE ]; then
|
|
|
|
|
echo "Up-to-date"
|
|
|
|
|
elif [ $LOCAL = $BASE ]; then
|
2019-10-13 15:44:46 +00:00
|
|
|
git stash
|
|
|
|
|
git pull
|
|
|
|
|
npm install
|
2019-10-13 15:41:29 +00:00
|
|
|
elif [ $REMOTE = $BASE ]; then
|
|
|
|
|
echo "Need to push"
|
|
|
|
|
else
|
|
|
|
|
echo "Diverged"
|
2019-10-13 14:36:36 +00:00
|
|
|
fi
|
