mirror of
https://github.com/git/git
synced 2024-08-24 18:26:02 +00:00
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
This commit is contained in:
commit
4f9ec8dd23
|
@ -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;
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Reference in a new issue