From: Junio C Hamano Date: Sun, 30 Jun 2013 22:39:35 +0000 (-0700) Subject: Merge branch 'jk/submodule-subdirectory-ok' X-Git-Tag: v1.8.4-rc0~107 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=d9857bfd4de097d662d40481664ef30577f120f5;p=git Merge branch 'jk/submodule-subdirectory-ok' Allow various subcommands of "git submodule" to be run not from the top of the working tree of the superproject. * jk/submodule-subdirectory-ok: submodule: drop the top-level requirement rev-parse: add --prefix option submodule: show full path in error message t7403: add missing && chaining t7403: modernize style t7401: make indentation consistent --- d9857bfd4de097d662d40481664ef30577f120f5 diff --cc git-submodule.sh index eb58c8e89d,7756d813c3..945e296d30 --- a/git-submodule.sh +++ b/git-submodule.sh @@@ -112,8 -150,9 +150,9 @@@ relative_path ( # module_list() { + eval "set $(git rev-parse --sq --prefix "$wt_prefix" -- "$@")" ( - git ls-files --error-unmatch --stage -- "$@" || + git ls-files -z --error-unmatch --stage -- "$@" || echo "unmatched pathspec exists" ) | perl -e '