git-remaster: restore stash when fetch fails

Author: ricardobeat

git-remaster

@@ -16,22 +16,22 @@ RSTASH=$(git stash create --include-untracked)
 
 if [[ $RSTASH ]]; then
     echo "Stashed $RSTASH"
+    git stash store -m "Remaster on branch $BRANCH $(date)" "$RSTASH"
 	git reset --hard
 fi
 
 # fetch updates
-git fetch --prune --no-tags origin $MASTER
- 
-# if not on master branch, check it out, update and return to branch
-if [[ $BRANCH != $MASTER ]]; then
-    git checkout $MASTER
+if git fetch --prune --no-tags origin $MASTER; then   
+    # if not on master branch, check it out, update and return to branch
+    if [[ $BRANCH != $MASTER ]]; then
+        git checkout $MASTER
+        git rebase origin/$MASTER --preserve-merges
+        git checkout -
+    fi
+    # rebase changes on top of origin/master
     git rebase origin/$MASTER --preserve-merges
-    git checkout -
 fi
 
-# rebase changes on top of origin/master
-git rebase origin/$MASTER --preserve-merges
- 
 # bring back stash if available, hide errors when empty
 if test $RSTASH; then
     git stash apply $RSTASH