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>

diff --git a/git-submodule.sh b/git-submodule.sh
index 79bfaac9d4cb9a04e5e1fd7675d740cf9fc27e87..48bdf843244503df247e0dbdef3c5541cd9eb48e 100755 (executable)
--- a/git-submodule.sh
+++ b/git-submodule.sh
@@ -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"
        ) |
        perl -e '
                echo "unmatched pathspec exists"
        ) |
        perl -e '


@@ -121,6 +121,7 @@ module_list()
        my ($null_sha1) = ("0" x 40);
        my @out = ();
        my $unmatched = 0;
        my ($null_sha1) = ("0" x 40);
        my @out = ();
        my $unmatched = 0;

+       $/ = "\0";

        while (<STDIN>) {
                if (/^unmatched pathspec/) {
                        $unmatched = 1;
        while (<STDIN>) {
                if (/^unmatched pathspec/) {
                        $unmatched = 1;

diff --git a/t/t7400-submodule-basic.sh b/t/t7400-submodule-basic.sh
index ff265353a375d02bb578fed29ea00f07dc08a6fc..d5743eeb4cb7a51cdbd7e28cf5f96cd5fc08cf02 100755 (executable)
--- 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 -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
 test_done