From f257a207f4a91960567b73465a4018f36381d26e Mon Sep 17 00:00:00 2001 From: Andreas Stallinger Date: Tue, 21 Feb 2017 18:01:23 +0100 Subject: [PATCH] script: publish script, switch back to branch switch back to branch if rebase does not work --- script/git-publish.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/script/git-publish.sh b/script/git-publish.sh index 30cb7e79..09cef063 100755 --- a/script/git-publish.sh +++ b/script/git-publish.sh @@ -99,6 +99,13 @@ fi echo -e $INFO "Rebasing on $PUBLISH_TO_BRANCH" git checkout -q $PUBLISH_TO_BRANCH git rebase -q $PUBLISH_BRANCH_NAME +if [ $? != 0 ] +then + git checkout -q $BRANCH_NAME + echo -e $ABORT "Rebasing on $PUBLISH_TO_BRANCH failed because of unstaged changes." + exit 1 +fi + git branch -q -d $PUBLISH_BRANCH_NAME echo -e $INFO "Uploading to origin $PUBLISH_TO_BRANCH"