From: Junio C Hamano <gitster@pobox•com>
To: "Øystein Walle" <oystwa@gmail•com>
Cc: git@vger•kernel.org
Subject: Re: [PATCH v4] completion: ignore chpwd_functions when cding on zsh
Date: Thu, 09 Oct 2014 13:01:00 -0700 [thread overview]
Message-ID: <xmqqwq8957yb.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <loom.20141009T214418-680@post.gmane.org> ("Øystein Walle"'s message of "Thu, 9 Oct 2014 19:47:08 +0000 (UTC)")
Øystein Walle <oystwa@gmail•com> writes:
> BUT: Over a year ago Git learned the -C argument. Couldn't we use that
> here? That way we would not have to unset CDPATH and can get rid of the
> subshell and cd -q. If we allow the other functions to use several
> arguments to pass options with we can get rid of the whole seperation
> between bash and zsh altogether.
Wow, that is an excellent suggestion. It would look like the
attached, right?
By stepping away further and further from the originally proposed
solution and trying to identify the real problem that needs to be
solved, you reached a better solution ;-).
contrib/completion/git-completion.bash | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 5ea5b82..f22de9d 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -281,16 +281,12 @@ __gitcomp_file ()
# argument, and using the options specified in the second argument.
__git_ls_files_helper ()
{
- (
- test -n "${CDPATH+set}" && unset CDPATH
- cd "$1"
- if [ "$2" == "--committable" ]; then
- git diff-index --name-only --relative HEAD
- else
- # NOTE: $2 is not quoted in order to support multiple options
- git ls-files --exclude-standard $2
- fi
- ) 2>/dev/null
+ if [ "$2" == "--committable" ]; then
+ git -C "$1" diff-index --name-only --relative HEAD
+ else
+ # NOTE: $2 is not quoted in order to support multiple options
+ git -C "$1" ls-files --exclude-standard $2
+ fi 2>/dev/null
}
next prev parent reply other threads:[~2014-10-09 20:01 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-10-08 3:53 [PATCH] completion: ignore chpwd_functions when cding Brandon Turner
2014-10-08 18:12 ` Junio C Hamano
2014-10-08 21:49 ` [PATCH v2] " Brandon Turner
2014-10-08 21:49 ` [PATCH v3] completion: ignore chpwd_functions when cding on zsh Brandon Turner
2014-10-09 7:34 ` Øystein Walle
2014-10-09 18:10 ` Junio C Hamano
2014-10-09 19:01 ` [PATCH v4] " Brandon Turner
2014-10-09 19:47 ` Øystein Walle
2014-10-09 20:01 ` Junio C Hamano [this message]
2014-10-09 20:45 ` Junio C Hamano
2014-10-09 22:04 ` Brandon Turner
2014-10-09 22:11 ` Junio C Hamano
2014-10-09 22:30 ` Brandon Turner
2014-10-16 18:10 ` Øystein Walle
2014-10-09 19:21 ` [PATCH v3] " Øystein Walle
2014-10-08 21:50 ` [PATCH] completion: ignore chpwd_functions when cding Brandon Turner
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=xmqqwq8957yb.fsf@gitster.dls.corp.google.com \
--to=gitster@pobox$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=oystwa@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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