From: Stephen Boyd <bebarino@gmail.com>
Date: Fri, 9 Oct 2009 06:21:44 +0000 (-0700)
Subject: completion: fix alias listings with newlines
X-Git-Tag: v1.6.5~9
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e0d78059540aab2e6ff720e7c940d7244cc12c18?ds=inline;hp=--cc

completion: fix alias listings with newlines

Aliases with newlines have been a problem since commit 56fc25f (Bash
completion support for remotes in .git/config., 2006-11-05). The chance
of the problem occurring has been slim at best, until commit 518ef8f
(completion: Replace config --list with --get-regexp, 2009-09-11)
removed the case statement introduced by commit 56fc25f. Before removing
the case statement, most aliases with newlines would work unless they
were specially crafted as follows

[alias]
foo = "log -1 --pretty='format:%s\nalias.error=broken'"

After removing the case statement, a more benign alias like

[alias]
whowhat = "log -1 --pretty='format:%an <%ae>\n%s'"
wont-complete = ...

would cause the completion to break badly.

For now, revert the removal of the case statement until someone comes up
with a better way to get keys from git-config.

Signed-off-by: Stephen Boyd <bebarino@gmail.com>
Acked-by: Shawn O. Pearce <spearce@spearce.org>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

e0d78059540aab2e6ff720e7c940d7244cc12c18
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 652a47c772..e482c8d076 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -602,8 +602,12 @@ __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/ */}"
+		case "$i" in
+		alias.*)
+			i="${i#alias.}"
+			echo "${i/ */}"
+			;;
+		esac
 	done
 }