Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint

gitster · gitster · commit 792c57273f5c · 2015-03-27T13:00:18.000-07:00
The code that reads from the ctags file in the completion script
(in contrib/) did not spell ${param/pattern/string} substitution
correctly, which happened to work with bash but not with zsh.

* js/completion-ctags-pattern-substitution-fix:
  contrib/completion: escape the forward slash in __git_match_ctag
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
@@ -1302,7 +1302,7 @@ _git_gitk ()
 }
 
 __git_match_ctag() {
-	awk "/^${1////\\/}/ { print \$1 }" "$2"
+	awk "/^${1//\//\\/}/ { print \$1 }" "$2"
 }
 
 _git_grep ()

Original file line number	Diff line number	Diff line change
`@@ -1302,7 +1302,7 @@ _git_gitk ()`
`1302`	`1302`	`}`
`1303`	`1303`
`1304`	`1304`	`__git_match_ctag() {`
`1305`		`- awk "/^${1////\\/}/ { print \$1 }" "$2"`
	`1305`	`+ awk "/^${1//\//\\/}/ { print \$1 }" "$2"`
`1306`	`1306`	`}`
`1307`	`1307`
`1308`	`1308`	`_git_grep ()`