Re: [[PATCH v3] 1/2] [submodule] handle multibyte characters in name
- From
Junio C Hamano <gitster@pobox.com>
- Date
- Jun 14, 2013, 17:23 UTC
- Message-ID
- <7va9msppw7.fsf@alter.siamese.dyndns.org>
- In-Reply-To
- <1371225365-4219-2-git-send-email-iveqy@iveqy.com>
Fredrik Gustafsson <iveqy@iveqy.com> writes:
> ... The > correct approach to solve the problem for all pathnames may be to use > "ls-files -z" and tell the Perl script that reads its output to read NUL > separated records by using $/ = "\0".
I've tentatively queued the attached without 2/2; the scriptlet is small enough not to matter in an eventual rewrite, so it shouldn't make a difference either way.
-- >8 -- From: Fredrik Gustafsson <iveqy@iveqy.com> Subject: [PATCH] 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> --- git-submodule.sh | 3 ++- t/t7400-submodule-basic.sh | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 79bfaac..48bdf84 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 ff26535..d5743ee 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
-- 1.8.3.1-538-gb4d04a7