Andrew's git / gitweb.git / diff
?
Merge branch 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn
authorJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 18:29:46 +0000 (10:29 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 22 Feb 2016 18:29:46 +0000 (10:29 -0800)
* 'ks/svn-pathnameencoding-4' of git://git.bogomips.org/git-svn:
git-svn: apply "svn.pathnameencoding" before URL encoding
git-svn: enable "svn.pathnameencoding" on dcommit
git-svn: hoist out utf8 prep from t9129 to lib-git-svn

contrib/completion/git-completion.bash patch | blob | history
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 45ec47f2b1b45e346290e7bbad143519b1ad91a6..e3918c87e3adf32a9d7a4f0320c92c497376b9b5 100644 (file)
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2415,8 +2415,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')"