From: Stephen Boyd <bebarino@gmail.com>
To: "Shawn O. Pearce" <spearce@spearce.org>
Cc: Junio C Hamano <gitster@pobox.com>, git@vger.kernel.org
Subject: [PATCH 1/3] completion: fix alias listings with newlines
Date: Wed, 7 Oct 2009 01:48:49 -0700 [thread overview]
Message-ID: <1254905331-29516-1-git-send-email-bebarino@gmail.com> (raw)
Since commit 518ef8f (completion: Replace config --list with
--get-regexp, 2009-09-11) an alias config value containing a newline
would break the completion of aliases. Instead of setting the IFS to the
newline, use git-config's null termination to separate aliases with the
null character.
An example .gitconfig causing the breakage.
[alias]
whowhat = "log -1 --pretty='format:%an <%ae>\n%s'"
wont-complete = ...
Signed-off-by: Stephen Boyd <bebarino@gmail.com>
---
This is the best I can come up with. I'm not sure about using the
d option of read though.
contrib/completion/git-completion.bash | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 2c2a0d4..332be99 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -600,10 +600,10 @@ __git_porcelain_commandlist="$(__git_porcelain_commands 2>/dev/null)"
__git_aliases ()
{
- local i IFS=$'\n'
- for i in $(git --git-dir="$(__gitdir)" config --get-regexp "alias\..*" 2>/dev/null); do
- i="${i#alias.}"
- echo "${i/ */}"
+ local i
+ git --git-dir="$(__gitdir)" config -z --get-regexp "alias\..*" 2>/dev/null |
+ while IFS= read -rd '' i; do
+ echo ${i#alias.} | cut -d' ' -f1
done
}
--
1.6.5.rc2.17.gdbc1b
next reply other threads:[~2009-10-07 8:56 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-07 8:48 Stephen Boyd [this message]
2009-10-07 8:48 ` [PATCH 2/3] completion: update am, commit, and log Stephen Boyd
2009-10-07 8:48 ` [PATCH 3/3] completion: add dirstat and friends to diff options Stephen Boyd
2009-10-07 19:45 ` Junio C Hamano
[not found] ` <20091007205059.GA16235@neumann>
2009-10-07 23:07 ` Junio C Hamano
[not found] ` <20091007233442.GJ6055@neumann>
2009-10-08 0:11 ` Stephen Boyd
2009-10-08 4:32 ` Shawn O. Pearce
2009-10-07 19:45 ` [PATCH 2/3] completion: update am, commit, and log Junio C Hamano
2009-10-07 9:33 ` [PATCH 1/3] completion: fix alias listings with newlines Johannes Sixt
2009-10-07 18:55 ` Stephen Boyd
2009-10-08 4:29 ` Shawn O. Pearce
2009-10-08 7:34 ` Stephen Boyd
2009-10-08 7:54 ` Johannes Sixt
2009-10-08 8:01 ` Stephen Boyd
2009-10-08 8:10 ` Johannes Sixt
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=1254905331-29516-1-git-send-email-bebarino@gmail.com \
--to=bebarino@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=spearce@spearce.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).