aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-03-23 11:28:16 -0700
committerJunio C Hamano <gitster@pobox.com>2015-03-23 11:28:16 -0700
commitc267a4d013d21a5b07cdab9c4c329d49e336544f (patch)
treee89bb1ba3243c16da2d1b0ca41119d82becb069c /contrib
parent61ca378275e83c48343c74a849ff0dcdef9abc91 (diff)
parentdb8d750876ce9c43b23ddfdbe618ec5dd12767ee (diff)
downloadgit-c267a4d013d21a5b07cdab9c4c329d49e336544f.tar.gz
git-c267a4d013d21a5b07cdab9c4c329d49e336544f.tar.xz
Merge branch 'js/completion-ctags-pattern-substitution-fix'
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
Diffstat (limited to 'contrib')
-rw-r--r--contrib/completion/git-completion.bash2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 51d81d859..931eac29a 100644
--- 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 ()