diff options
| -rw-r--r-- | contrib/completion/git-completion.bash | 6 | ||||
| -rwxr-xr-x | t/t9902-completion.sh | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash index 57fc7417f9..2a8fe2aa18 100644 --- a/contrib/completion/git-completion.bash +++ b/contrib/completion/git-completion.bash @@ -371,10 +371,12 @@ __gitcomp_file () __git_ls_files_helper () { if [ "$2" == "--committable" ]; then - __git -C "$1" diff-index --name-only --relative HEAD + __git -C "$1" -c core.quotePath=false diff-index \ + --name-only --relative HEAD else # NOTE: $2 is not quoted in order to support multiple options - __git -C "$1" ls-files --exclude-standard $2 + __git -C "$1" -c core.quotePath=false ls-files \ + --exclude-standard $2 fi } diff --git a/t/t9902-completion.sh b/t/t9902-completion.sh index 98a672ce32..f7d7becbb9 100755 --- a/t/t9902-completion.sh +++ b/t/t9902-completion.sh @@ -1463,7 +1463,7 @@ test_expect_failure 'complete files - quoted characters on cmdline' ' "New(Dir/New)File.c" ' -test_expect_failure 'complete files - UTF-8 in ls-files output' ' +test_expect_success 'complete files - UTF-8 in ls-files output' ' test_when_finished "rm -r árvíztűrő" && mkdir árvíztűrő && >"árvíztűrő/Сайн яваарай" && |