kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Junio C Hamano 2013-06-26 15:07:35 -07:00
parent 9832cb9d4d bed9470489
commit 4f9ec8dd23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
git-submodule.sh
View File

@ -113,7 +113,7 @@ resolve_relative_url ()
module_list() module_list()
{ {
( (
git ls-files --error-unmatch --stage -- "$@" || git ls-files -z --error-unmatch --stage -- "$@" ||
echo "unmatched pathspec exists" echo "unmatched pathspec exists"
) | ) |
perl -e ' perl -e '
@ -121,6 +121,7 @@ module_list()
my ($null_sha1) = ("0" x 40); my ($null_sha1) = ("0" x 40);
my @out = (); my @out = ();
my $unmatched = 0; my $unmatched = 0;
$/ = "\0";
while (<STDIN>) { while (<STDIN>) {
if (/^unmatched pathspec/) { if (/^unmatched pathspec/) {
$unmatched = 1; $unmatched = 1;

15
t/t7400-submodule-basic.sh
View File

@ -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 -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 test_done