Restore original directory on error

Author: wulfgarpro

history-sync.plugin.zsh

@@ -271,6 +271,7 @@ history_sync_push() {
                 [Yy]* )
                     DIR=$(pwd)
                     cd "$ZSH_HISTORY_PROJ" && GIT add * && GIT commit -m "$ZSH_HISTORY_COMMIT_MSG"
+                    local status=$?
 
                     if [[ $force = false ]]; then
                         echo -n "$bold_color${fg[yellow]}Do you want to push to remote (y/N)?$reset_color "
@@ -283,19 +284,14 @@ history_sync_push() {
                         case "$push" in
                             [Yy]* )
                                 GIT push
-                                if [[ "$?" != 0 ]]; then
-                                    _print_git_error_msg
-                                    cd "$DIR"
-                                    return
-                                fi
-                                cd "$DIR"
+                                status=$?
                                 ;;
                         esac
                     fi
 
-                    if [[ "$?" != 0 ]]; then
+                    cd "$DIR"
+                    if [[ "$status" != 0 ]]; then
                         _print_git_error_msg
-                        cd "$DIR"
                         return
                     fi
                     ;;