From: Matthieu Moy <Matthieu.Moy@imag.fr>
To: git@vger.kernel.org
Cc: Matthieu Moy <Matthieu.Moy@imag.fr>
Subject: [RFC/PATCH] git-completion.bash: remove bashism to fix ZSH compatibility
Date: Mon, 11 Mar 2013 13:21:27 +0100 [thread overview]
Message-ID: <1363004487-1193-1-git-send-email-Matthieu.Moy@imag.fr> (raw)
The function-wide redirection used for __git_ls_files_helper and
__git_diff_index_helper work only with bash. Using ZSH, trying to
complete an inexistant directory gave this:
git add no-such-dir/__git_ls_files_helper:cd:2: no such file or directory: no-such-dir/
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
---
These two instances seem to be the only ones in the file.
I'm not sure whether the 2>/dev/null would be needed for the command
on the RHS of the && too (git ls-files and git diff-index).
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 b62bec0..0640274 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -300,8 +300,8 @@ __git_index_file_list_filter ()
__git_ls_files_helper ()
{
# NOTE: $2 is not quoted in order to support multiple options
- cd "$1" && git ls-files --exclude-standard $2
-} 2>/dev/null
+ cd "$1" 2>/dev/null && git ls-files --exclude-standard $2
+}
# Execute git diff-index, returning paths relative to the directory
@@ -309,8 +309,8 @@ __git_ls_files_helper ()
# specified in the second argument.
__git_diff_index_helper ()
{
- cd "$1" && git diff-index --name-only --relative "$2"
-} 2>/dev/null
+ cd "$1" 2>/dev/null && git diff-index --name-only --relative "$2"
+}
# __git_index_files accepts 1 or 2 arguments:
# 1: Options to pass to ls-files (required).
--
1.8.2.rc3.16.g0a33571.dirty
next reply other threads:[~2013-03-11 12:22 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-11 12:21 Matthieu Moy [this message]
2013-03-11 16:17 ` [RFC/PATCH] git-completion.bash: remove bashism to fix ZSH compatibility Junio C Hamano
2013-03-11 16:41 ` Junio C Hamano
2013-03-11 16:47 ` Matthieu Moy
2013-03-11 17:01 ` Junio C Hamano
2013-03-11 17:12 ` Manlio Perillo
2013-03-11 17:09 ` Manlio Perillo
2013-03-11 17:23 ` Junio C Hamano
2013-03-11 17:48 ` Matthieu Moy
2013-03-11 18:09 ` Junio C Hamano
2013-03-11 18:19 ` Paul Smith
2013-03-11 19:09 ` Manlio Perillo
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=1363004487-1193-1-git-send-email-Matthieu.Moy@imag.fr \
--to=matthieu.moy@imag.fr \
--cc=git@vger.kernel.org \
/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).