diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:35:17 -0700 |
| commit | 1f101bf6507bdc786666beac6d9a7480066a020f (patch) | |
| tree | ccdc9979ee8f16e44160ea47b332cb4389424a55 /git-submodule.sh | |
| parent | Merge branch 'fc/sequencer-plug-leak' into maint (diff) | |
| parent | t7400: test of UTF-8 submodule names pass under Mac OS (diff) | |
| download | tgif-1f101bf6507bdc786666beac6d9a7480066a020f.tar.xz | |
Merge branch 'fg/submodule-non-ascii-path' into maint
Many "git submodule" operations did 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 79bfaac9d4..48bdf84324 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; |