diff options
| author | Fredrik Gustafsson <iveqy@iveqy.com> | 2013-06-14 02:26:02 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-14 08:04:32 -0700 |
| commit | 74671241fd53df2899d4b4400593afc12e8e1bf7 (patch) | |
| tree | c62bb8d3553257a4bf94ab674d9606b77d511308 | |
| parent | edca4152560522a431a51fc0a06147fc680b5b18 (diff) | |
| download | git-74671241fd53df2899d4b4400593afc12e8e1bf7.tar.gz | |
handle multibyte characters in name
Many "git submodule" operations do not work on a submodule at a path whose
name is not in ASCII.
This is because "git ls-files" is used to find which paths are bound to
submodules to the current working tree, and the output is C-quoted by default
for non ASCII pathnames.
Tell "git ls-files" to not C-quote its output, which is easier than unwrapping
C-quote ourselves.
Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rwxr-xr-x | git-submodule.sh | 3 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 12 |
2 files changed, 14 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 79bfaac9d4..48bdf84324 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -113,7 +113,7 @@ resolve_relative_url () module_list() { ( - git ls-files --error-unmatch --stage -- "$@" || + git ls-files -z --error-unmatch --stage -- "$@" || echo "unmatched pathspec exists" ) | perl -e ' @@ -121,6 +121,7 @@ module_list() my ($null_sha1) = ("0" x 40); my @out = (); my $unmatched = 0; + $/ = "\0"; while (<STDIN>) { if (/^unmatched pathspec/) { $unmatched = 1; diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh index ff265353a3..d5743eeb4c 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -868,4 +868,16 @@ test_expect_success 'submodule deinit fails when submodule has a .git directory test -n "$(git config --get-regexp "submodule\.example\.")" ' +test_expect_success 'submodule with strange name works "å äö"' ' + mkdir "å äö" && + ( + cd "å äö" && + git init && + touch sub + git add sub + git commit -m "init sub" + ) + git submodule add "/å äö" && + test -n "$(git submodule | grep "å äö")" +' test_done |