[[PATCH v3] 1/2] [submodule] handle multibyte characters in name

From: Fredrik Gustafsson <iveqy@iveqy.com>
Date: Jun 14, 2013, 15:56 UTC
Message-ID: <1371225365-4219-2-git-send-email-iveqy@iveqy.com>
In-Reply-To: <1371225365-4219-1-git-send-email-iveqy@iveqy.com>

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 and pathnames that has a double-quote, a backslash or a control character like a newline or a tab in thme.

Tell "git ls-files" to not C-quote its output, which is easier than unwrapping C-quote ourselves.

This patch still does not allow pathnames with characters that do need C-quote, but the code didn't handle them before, so it is not making things worse. 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".

Solution-suggested-by: Junio C Hamano <gitster@pobox.com>
Signed-off-by: Fredrik Gustafsson <iveqy@iveqy.com>
---
 git-submodule.sh           |  2 +-
 t/t7400-submodule-basic.sh | 12 ++++++++++++
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/git-submodule.sh b/git-submodule.sh
index 79bfaac..bad051e 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 -c core.quotepath=false ls-files --error-unmatch --stage -- "$@" ||
 		echo "unmatched pathspec exists"
 	) |
 	perl -e '
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.381.g2ab719e.dirty