Merge branch 'pw/completion-stash' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:20 +0000 (13:10 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 21:10:20 +0000 (13:10 -0800)
* pw/completion-stash:
  completion: fix mis-indentation in _git_stash()

contrib/completion/git-completion.bash

index 63f5c04..00d7299 100644 (file)
@@ -2413,8 +2413,8 @@ _git_stash ()
                show,--*|branch,--*)
                        ;;
                branch,*)
-                 if [ $cword -eq 3 ]; then
-                       __gitcomp_nl "$(__git_refs)";
+                       if [ $cword -eq 3 ]; then
+                               __gitcomp_nl "$(__git_refs)";
                        else
                                __gitcomp_nl "$(git --git-dir="$(__gitdir)" stash list \
                                                | sed -n -e 's/:.*//p')"