Merge branch 'nd/complete-fetch-multiple-args'
authorJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:01 +0000 (13:34 +0900)
committerJunio C Hamano <gitster@pobox.com>
Fri, 19 Oct 2018 04:34:01 +0000 (13:34 +0900)
Teach bash completion that "git fetch --multiple" only takes remote
names as arguments and no refspecs.

* nd/complete-fetch-multiple-args:
completion: support "git fetch --multiple"

1  2 
contrib/completion/git-completion.bash
index 06ec6ca11399b21c6de5c0f5678dcb94d3925008,a66bec966bd58828dd52ae619d148881853ccb6f..db7fd87b6b27f6e85a48b31d08e0480648f9c5d5
@@@ -943,6 -943,7 +943,7 @@@ __git_complete_remote_or_refspec (
                        *) ;;
                        esac
                        ;;
+               --multiple) no_complete_refspec=1; break ;;
                -*) ;;
                *) remote="$i"; break ;;
                esac
@@@ -2567,9 -2568,6 +2568,9 @@@ _git_stash (
                drop,--*)
                        __gitcomp "--quiet"
                        ;;
 +              list,--*)
 +                      __gitcomp "--name-status --oneline --patch-with-stat"
 +                      ;;
                show,--*|branch,--*)
                        ;;
                branch,*)