diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:36 -0700 |
| commit | 4f9ec8dd23ca463c4da782c11cea7a18ec111e15 (patch) | |
| tree | 0431e5ad5dfa94f763850aeaf99eddc8387ed381 | |
| parent | Update draft release notes to 1.8.4 (diff) | |
| parent | t7400: test of UTF-8 submodule names pass under Mac OS (diff) | |
| download | tgif-4f9ec8dd23ca463c4da782c11cea7a18ec111e15.tar.xz | |
Merge branch 'fg/submodule-non-ascii-path'
Many "git submodule" operations do not work on a submodule at a
path whose name is not in ASCII.
* fg/submodule-non-ascii-path:
t7400: test of UTF-8 submodule names pass under Mac OS
handle multibyte characters in name
| -rwxr-xr-x | git-submodule.sh | 3 | ||||
| -rwxr-xr-x | t/t7400-submodule-basic.sh | 15 |
2 files changed, 17 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 75feaf1749..eb58c8e89d 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 f47cc7b604..71a42f0086 100755 --- a/t/t7400-submodule-basic.sh +++ b/t/t7400-submodule-basic.sh @@ -868,4 +868,19 @@ 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 UTF-8 name' ' + svname=$(printf "\303\245 \303\244\303\266") && + mkdir "$svname" && + ( + cd "$svname" && + git init && + >sub && + git add sub && + git commit -m "init sub" + ) && + test_config core.precomposeunicode true && + git submodule add ./"$svname" && + git submodule >&2 && + test -n "$(git submodule | grep "$svname")" +' test_done |