From: Junio C Hamano <gitster@pobox.com>
Date: Fri, 19 Oct 2018 04:34:01 +0000 (+0900)
Subject: Merge branch 'nd/complete-fetch-multiple-args'
X-Git-Tag: v2.20.0-rc0~165
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/aef8e71f1512c2edb1b323969d3f215a23ff1c04?ds=inline;hp=-c

Merge branch 'nd/complete-fetch-multiple-args'

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"
---

aef8e71f1512c2edb1b323969d3f215a23ff1c04
diff --combined contrib/completion/git-completion.bash
index 06ec6ca113,a66bec966b..db7fd87b6b
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@@ -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,*)