diff --git a/deploy.sh b/deploy.sh index 141f111..79c14fe 100755 --- a/deploy.sh +++ b/deploy.sh @@ -7,8 +7,12 @@ LOCAL=$(git rev-parse @) REMOTE=$(git rev-parse "$UPSTREAM") BASE=$(git merge-base @ "$UPSTREAM") -if [ $LOCAL = $BASE ]; then - git stash - git pull - npm install +if [ $LOCAL = $REMOTE ]; then + echo "Up-to-date" +elif [ $LOCAL = $BASE ]; then + echo "Need to pull" +elif [ $REMOTE = $BASE ]; then + echo "Need to push" +else + echo "Diverged" fi