git-publish

#!/bin/sh
# Created by Michael Baltaks

# Don't allow using unset vars (-u)
set -o nounset
# Exit on error (-e)
#set -o errexit (not used here because if git pull fails we need to clean up)

branch_name="$(git symbolic-ref HEAD 2>/dev/null)" || branch_name="(unnamed branch)"     # detached HEAD
branch_name="${branch_name##refs/heads/}"

if [ "${branch_name}" = "(unnamed branch)" ]
then
	echo "This will not run if you're not on a normal branch."
	exit 0
fi

# stop if there is already something stashed.
stash_list=`git stash list`
if [[ ${stash_list} == *stash* ]]
then
	echo "There are already stashed changes, please empty your stash before using this script"
	exit 0
fi

git stash && git checkout master && git pull

if [ 0 = $? ]
then
	git rebase master "${branch_name}"
else
	echo "git pull failed"
	git checkout "${branch_name}" && git stash pop
fi

if [ 0 = $? ]
then
	git checkout master && git merge "${branch_name}" && git push
else
	echo "git rebase failed, you need to solve the conflicts"
	exit 1;
fi

if [ 0 = $? ]
then
	git rebase master "${branch_name}" && git stash pop
	exit 0;
else
	echo "git push failed"
	git checkout "${branch_name}" && git stash pop
fi