git-completion.bash: extract from else in _git_stash()

To save a level of indentation, perform an early return in the "if" arm
so we can move the "else" code out of the block.

Signed-off-by: Denton Liu <liu.denton@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index a2f1b5e9164560e6be032da55e9b725ccb783884..8d4d8cc0feee10231a58eae0c1d69a561c924250 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -3035,44 +3035,45 @@ _git_stash ()
                        fi
                        ;;
                esac
-       else
-               case "$subcommand,$cur" in
-               push,--*)
-                       __gitcomp "$save_opts --message"
-                       ;;
-               save,--*)
-                       __gitcomp "$save_opts"
-                       ;;
-               apply,--*|pop,--*)
-                       __gitcomp "--index --quiet"
-                       ;;
-               drop,--*)
-                       __gitcomp "--quiet"
-                       ;;
-               list,--*)
-                       __gitcomp "--name-status --oneline --patch-with-stat"
-                       ;;
-               show,--*)
-                       __gitcomp "$__git_diff_common_options"
-                       ;;
-               branch,--*)
-                       ;;
-               branch,*)
-                       if [ $cword -eq $((__git_subcommand_idx+2)) ]; then
-                               __git_complete_refs
-                       else
-                               __gitcomp_nl "$(__git stash list \
-                                               | sed -n -e 's/:.*//p')"
-                       fi
-                       ;;
-               show,*|apply,*|drop,*|pop,*)
+               return
+       fi
+
+       case "$subcommand,$cur" in
+       push,--*)
+               __gitcomp "$save_opts --message"
+               ;;
+       save,--*)
+               __gitcomp "$save_opts"
+               ;;
+       apply,--*|pop,--*)
+               __gitcomp "--index --quiet"
+               ;;
+       drop,--*)
+               __gitcomp "--quiet"
+               ;;
+       list,--*)
+               __gitcomp "--name-status --oneline --patch-with-stat"
+               ;;
+       show,--*)
+               __gitcomp "$__git_diff_common_options"
+               ;;
+       branch,--*)
+               ;;
+       branch,*)
+               if [ $cword -eq $((__git_subcommand_idx+2)) ]; then
+                       __git_complete_refs
+               else
                        __gitcomp_nl "$(__git stash list \
                                        | sed -n -e 's/:.*//p')"
-                       ;;
-               *)
-                       ;;
-               esac
-       fi
+               fi
+               ;;
+       show,*|apply,*|drop,*|pop,*)
+               __gitcomp_nl "$(__git stash list \
+                               | sed -n -e 's/:.*//p')"
+               ;;
+       *)
+               ;;
+       esac
 }
 
 _git_submodule ()