Skip to content

Commit 25ae7cf

Browse files
felipecgitster
authored andcommitted
completion: fix shell expansion of items
As reported by Jeroen Meijer[1]; the current code doesn't deal properly with items (tags, branches, etc.) that have ${} in them because they get expaned by bash while using compgen. A simple solution is to quote the items so they get expanded properly (\$\{\}). In order to achieve that I took bash-completion's quote() function, which is rather simple, and renamed it to __git_quote() as per Jeff King's suggestion. Solves the original problem for me. [1] http://article.gmane.org/gmane.comp.version-control.git/201596 Signed-off-by: Felipe Contreras <[email protected]> Acked-by: Jeff King <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 304b7d9 commit 25ae7cf

File tree

1 file changed

+8
-1
lines changed

1 file changed

+8
-1
lines changed

contrib/completion/git-completion.bash

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,13 @@ _get_comp_words_by_ref ()
225225
fi
226226
fi
227227

228+
# Quotes the argument for shell reuse
229+
__git_quote()
230+
{
231+
local quoted=${1//\'/\'\\\'\'}
232+
printf "'%s'" "$quoted"
233+
}
234+
228235
# Generates completion reply with compgen, appending a space to possible
229236
# completion words, if necessary.
230237
# It accepts 1 to 4 arguments:
@@ -261,7 +268,7 @@ __gitcomp ()
261268
__gitcomp_nl ()
262269
{
263270
local IFS=$'\n'
264-
COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$1" -- "${3-$cur}"))
271+
COMPREPLY=($(compgen -P "${2-}" -S "${4- }" -W "$(__git_quote "$1")" -- "${3-$cur}"))
265272
}
266273

267274
__git_heads ()

0 commit comments

Comments
 (0)