diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-06-26 15:07:36 -0700 |
| commit | 4f9ec8dd23ca463c4da782c11cea7a18ec111e15 (patch) | |
| tree | 0431e5ad5dfa94f763850aeaf99eddc8387ed381 /git-submodule.sh | |
| parent | 9832cb9d4dc969fbfacfd1f8940fcbdec18bb930 (diff) | |
| parent | bed947048919d0ed8b8eece38eb18b15f99e313f (diff) | |
| download | git-4f9ec8dd23ca463c4da782c11cea7a18ec111e15.tar.gz | |
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
Diffstat (limited to 'git-submodule.sh')
| -rwxr-xr-x | git-submodule.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/git-submodule.sh b/git-submodule.sh index 75feaf1749..eb58c8e89d 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; |