summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2015-03-27 13:00:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2015-03-27 13:00:18 -0700
commit792c57273f5ccc318c93d32112548fbd033f5964 (patch)
tree850fb291290a027ad61b7ec32647815f63763f1e /contrib
parentUpdate mailmap to spell out "Alexander Kuleshov" (diff)
parentcontrib/completion: escape the forward slash in __git_match_ctag (diff)
downloadtgif-792c57273f5ccc318c93d32112548fbd033f5964.tar.xz
Merge branch 'js/completion-ctags-pattern-substitution-fix' into maint
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 b8929084d0..485619c260 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 ()