summaryrefslogtreecommitdiff
path: root/contrib/completion
diff options
context:
space:
mode:
authorLessley Dennington <lessleydennington@gmail.com>2022-02-07 17:31:45 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-02-08 18:15:43 (GMT)
commit48803821b1712687d6e06e9d7a0e911eabecf4d1 (patch)
treec27ef270183a0ee6f2cf5953c1933cdf5c5bb34c /contrib/completion
parentc5f5c5082f813a875c213445135a24c2507021dd (diff)
downloadgit-48803821b1712687d6e06e9d7a0e911eabecf4d1.zip
git-48803821b1712687d6e06e9d7a0e911eabecf4d1.tar.gz
git-48803821b1712687d6e06e9d7a0e911eabecf4d1.tar.bz2
completion: handle unusual characters for sparse-checkout
Update the __gitcomp_directories method to de-quote and handle unusual characters in directory names. Although this initially involved an attempt to re-use the logic in __git_index_files, this method removed subdirectories (e.g. folder1/0/ became folder1/), so instead new custom logic was placed directly in the __gitcomp_directories method. Note there are two tests for this new functionality - one for spaces and accents and one for backslashes and tabs. The backslashes and tabs test uses FUNNYNAMES to avoid running on Windows. This is because: 1. Backslashes are explicitly not allowed in Windows file paths. 2. Although tabs appear to be allowed when creating a file in a Windows bash shell, they actually are not renderable (and appear as empty boxes in the shell). Co-authored-by: Johannes Schindelin <johannes.schindelin@gmx.de> Co-authored-by: Lessley Dennington <lessleydennington@gmail.com> Helped-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Lessley Dennington <lessleydennington@gmail.com> Reviewed-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/completion')
-rw-r--r--contrib/completion/git-completion.bash24
1 files changed, 11 insertions, 13 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index 69ef33b..23e4c90 100644
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -2988,7 +2988,7 @@ _git_show_branch ()
__gitcomp_directories ()
{
- local _tmp_dir _tmp_completions
+ local _tmp_dir _tmp_completions _found=0
# Get the directory of the current token; this differs from dirname
# in that it keeps up to the final trailing slash. If no slash found
@@ -2996,20 +2996,18 @@ __gitcomp_directories ()
[[ "$cur" =~ .*/ ]]
_tmp_dir=$BASH_REMATCH
- # Find possible directory completions, adding trailing '/' characters
- _tmp_completions="$(git ls-tree -d --name-only HEAD $_tmp_dir |
- sed -e s%$%/%)"
-
- if [[ -n "$_tmp_completions" ]]; then
- # There were some directory completions, so find ones that
- # start with "$cur", the current token, and put those in COMPREPLY
- local i=0 c IFS=$' \t\n'
- for c in $_tmp_completions; do
+ # Find possible directory completions, adding trailing '/' characters,
+ # de-quoting, and handling unusual characters.
+ while IFS= read -r -d $'\0' c ; do
+ # If there are directory completions, find ones that start
+ # with "$cur", the current token, and put those in COMPREPLY
if [[ $c == "$cur"* ]]; then
- COMPREPLY+=("$c")
+ COMPREPLY+=("$c/")
+ _found=1
fi
- done
- elif [[ "$cur" =~ /$ ]]; then
+ done < <(git ls-tree -z -d --name-only HEAD $_tmp_dir)
+
+ if [[ $_found == 0 ]] && [[ "$cur" =~ /$ ]]; then
# No possible further completions any deeper, so assume we're at
# a leaf directory and just consider it complete
__gitcomp_direct_append "$cur "