From: Todd Zullinger <tmz@pobox.com>
To: Duy Nguyen <pclouds@gmail.com>
Cc: "Jeff King" <peff@peff.net>,
git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
"SZEDER Gábor" <szeder.dev@gmail.com>,
"Eric Sunshine" <sunshine@sunshineco.com>
Subject: [PATCH v3 4/4] completion: use __git when calling --list-cmds
Date: Wed, 20 Mar 2019 14:03:29 -0400 [thread overview]
Message-ID: <20190320180329.22280-5-tmz@pobox.com> (raw)
In-Reply-To: <CACsJy8DiQwmAKMruOAO4roPbiRTvt5TESBTd682hTwkZjcoj2Q@mail.gmail.com>
Since e51bdea6d3 ("git: read local config in --list-cmds", 2019-03-01),
the completion.commands variable respects repo-level configuration. Use
__git which ensures that the proper repo config is consulted if the
command line contains 'git -C /some/other/repo'.
Suggested-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Todd Zullinger <tmz@pobox.com>
---
contrib/completion/git-completion.bash | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 499e56f83d..e505f04ff7 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1010,7 +1010,7 @@ __git_all_commands=
__git_compute_all_commands ()
{
test -n "$__git_all_commands" ||
- __git_all_commands=$(git --list-cmds=main,others,alias,nohelpers)
+ __git_all_commands=$(__git --list-cmds=main,others,alias,nohelpers)
}
# Lists all set config variables starting with the given section prefix,
@@ -1620,9 +1620,9 @@ _git_help ()
esac
if test -n "$GIT_TESTING_ALL_COMMAND_LIST"
then
- __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(git --list-cmds=alias,list-guide) gitk"
+ __gitcomp "$GIT_TESTING_ALL_COMMAND_LIST $(__git --list-cmds=alias,list-guide) gitk"
else
- __gitcomp "$(git --list-cmds=main,nohelpers,alias,list-guide) gitk"
+ __gitcomp "$(__git --list-cmds=main,nohelpers,alias,list-guide) gitk"
fi
}
@@ -2888,7 +2888,7 @@ __git_main ()
then
__gitcomp "$GIT_TESTING_PORCELAIN_COMMAND_LIST"
else
- __gitcomp "$(git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
+ __gitcomp "$(__git --list-cmds=list-mainporcelain,others,nohelpers,alias,list-complete,config)"
fi
;;
esac
next prev parent reply other threads:[~2019-03-20 18:03 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-28 22:31 [BUG] completion.commands does not remove multiple commands Todd Zullinger
2019-02-28 23:05 ` Jeff King
2019-03-01 17:34 ` Todd Zullinger
2019-03-01 18:30 ` Jeff King
2019-03-01 22:15 ` Todd Zullinger
2019-03-01 23:08 ` Jeff King
2019-03-02 1:08 ` Duy Nguyen
2019-03-02 1:18 ` Junio C Hamano
2019-03-02 2:40 ` Todd Zullinger
2019-03-02 4:07 ` SZEDER Gábor
2019-03-03 1:34 ` Todd Zullinger
2019-03-03 17:06 ` Jeff King
2019-03-01 17:34 ` [PATCH 1/3] doc: note config file restrictions for completion.commands Todd Zullinger
2019-03-17 13:12 ` Duy Nguyen
2019-03-17 18:16 ` [PATCH v2 0/4] completion.commands: fix multiple command removals Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 1/4] git: read local config in --list-cmds Todd Zullinger
2019-03-18 9:41 ` Duy Nguyen
2019-03-20 18:03 ` [PATCH v3 0/4] completion.commands: fix multiple command removals Todd Zullinger
2019-03-21 2:58 ` Junio C Hamano
2019-03-21 17:18 ` Todd Zullinger
2019-03-21 9:45 ` Duy Nguyen
2019-03-20 18:03 ` [PATCH v3 1/4] git: read local config in --list-cmds Todd Zullinger
2019-03-20 18:03 ` [PATCH v3 2/4] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-20 18:03 ` [PATCH v3 3/4] completion: fix multiple command removals Todd Zullinger
2019-03-20 18:03 ` Todd Zullinger [this message]
2019-03-17 18:16 ` [PATCH v2 2/4] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 3/4] completion: fix multiple command removals Todd Zullinger
2019-03-17 18:16 ` [PATCH v2 4/4] completion: use __git when calling --list-cmds Todd Zullinger
2019-03-01 17:34 ` [PATCH 2/3] t9902: test multiple removals via completion.commands Todd Zullinger
2019-03-01 18:22 ` Eric Sunshine
2019-03-01 20:50 ` SZEDER Gábor
2019-03-01 21:56 ` Todd Zullinger
2019-03-01 17:34 ` [PATCH 3/3] completion: fix multiple command removals Todd Zullinger
2019-03-01 18:16 ` Jeff King
2019-02-28 23:05 ` [BUG] completion.commands does not remove multiple commands SZEDER Gábor
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190320180329.22280-5-tmz@pobox.com \
--to=tmz@pobox.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=pclouds@gmail.com \
--cc=peff@peff.net \
--cc=sunshine@sunshineco.com \
--cc=szeder.dev@gmail.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).