git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Fredrik Gustafsson <iveqy@iveqy.com>
Cc: git@vger.kernel.org
Subject: Re: [PATCH v2 1/2] [submodule] handle multibyte characters in name
Date: Fri, 14 Jun 2013 08:02:04 -0700	[thread overview]
Message-ID: <7vppvorb0z.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: <1371169563-10267-2-git-send-email-iveqy@iveqy.com> (Fredrik Gustafsson's message of "Fri, 14 Jun 2013 02:26:02 +0200")

Fredrik Gustafsson <iveqy@iveqy.com> writes:

> Many "git submodule" operations do not work on a submodule at a path whose
> name is not in ASCII.

Thanks.  A suggestion to add some more explanation to the log
message follows.

> 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 them.

> 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

  reply	other threads:[~2013-06-14 15:02 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-06-14  0:26 [PATCH v2 0/2] module_list enhancements Fredrik Gustafsson
2013-06-14  0:26 ` [PATCH v2 1/2] [submodule] handle multibyte characters in name Fredrik Gustafsson
2013-06-14 15:02   ` Junio C Hamano [this message]
2013-06-14  0:26 ` [PATCH v2 2/2] [submodule] Replace perl-code with sh Fredrik Gustafsson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=7vppvorb0z.fsf@alter.siamese.dyndns.org \
    --to=gitster@pobox.com \
    --cc=git@vger.kernel.org \
    --cc=iveqy@iveqy.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).