git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ramkumar Ramachandra <artagnon@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Felipe Contreras <felipe.contreras@mail.com>,
	Git List <git@vger.kernel.org>
Subject: [PATCH 4/5] git-completion.bash: add branch.*.pushremote to config list
Date: Mon, 29 Apr 2013 18:19:40 +0530	[thread overview]
Message-ID: <1367239781-5232-5-git-send-email-artagnon@gmail.com> (raw)
In-Reply-To: <1367239781-5232-1-git-send-email-artagnon@gmail.com>

9f765ce (remote.c: introduce branch.<name>.pushremote, 2013-04-02)
introduced the configuration variable branch.*.pushremote, but forgot
to teach git-completion.bash about it.  Fix this.

Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 contrib/completion/git-completion.bash | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 7bb11a1..af271cc 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1810,7 +1810,7 @@ __git_config_get_set_variables ()
 _git_config ()
 {
 	case "$prev" in
-	branch.*.remote)
+	branch.*.remote|branch.*.pushremote)
 		__gitcomp_nl "$(__git_remotes)"
 		return
 		;;
@@ -1906,7 +1906,7 @@ _git_config ()
 		;;
 	branch.*.*)
 		local pfx="${cur%.*}." cur_="${cur##*.}"
-		__gitcomp "remote merge mergeoptions rebase" "$pfx" "$cur_"
+		__gitcomp "remote pushremote merge mergeoptions rebase" "$pfx" "$cur_"
 		return
 		;;
 	branch.*)
-- 
1.8.2.1.616.ga1e5536.dirty

  parent reply	other threads:[~2013-04-29 12:48 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-04-29 12:49 [PATCH 0/5] [RESEND] Minor additions to git-completion.bash Ramkumar Ramachandra
2013-04-29 12:49 ` [PATCH 1/5] git-completion.bash: lexical sorting for diff.statGraphWidth Ramkumar Ramachandra
2013-04-29 12:49 ` [PATCH 2/5] git-completion.bash: add diff.submodule to config list Ramkumar Ramachandra
2013-04-29 12:49 ` [PATCH 3/5] git-completion.bash: complete branch.*.rebase as boolean Ramkumar Ramachandra
2013-04-29 12:49 ` Ramkumar Ramachandra [this message]
2013-04-29 12:49 ` [PATCH 5/5] git-completion.bash: add remote.pushdefault to config list Ramkumar Ramachandra
2013-04-29 12:50 ` [PATCH 0/5] [RESEND] Minor additions to git-completion.bash Ramkumar Ramachandra
2013-04-29 16:58   ` Junio C Hamano
  -- strict thread matches above, loose matches on Subject: below --
2013-04-21 13:05 [PATCH 0/5] " Ramkumar Ramachandra
2013-04-21 13:05 ` [PATCH 4/5] git-completion.bash: add branch.*.pushremote to config list Ramkumar Ramachandra

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1367239781-5232-5-git-send-email-artagnon@gmail.com \
    --to=artagnon@gmail.com \
    --cc=felipe.contreras@mail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).