[PATCHv2 1/2] submodule: preserve all arguments exactly when recursing
- From
Kevin Ballard <kevin@sb.org>
- Date
- Nov 3, 2010, 05:05 UTC
- Message-ID
- <1288760740-10075-1-git-send-email-kevin@sb.org>
- In-Reply-To
- <5BE96A08-B8AB-4041-ABF2-7095EB5DD585@sb.org>
When performing a recursive status or update, any argments with whitespace would be split along that whitespace when passed to the recursive invocation of the update or status command.
This is caused by the special handling that sh provides to the $@ variable. Status and update stored "$@" into a separate variable, and passed that variable to the recursive invocation. Unfortunately, the special handling afforded to $@ isn't given to this new variable, and word-breaking occurs along whitespace boundaries.
We can use $(git rev-parse --sq-quote "$@") to produce a string containing a quoted version of all given args, suitable for passing to eval. We then recurse using something like `eval cmd_status "$orig_args"` instead of the former `cmd_status $orig_args`. This preserves all arguments exactly as given to the initial invocation of the command.
Helped-By: Jonathan Nieder <jrnieder@gmail.com> Signed-off-by: Kevin Ballard <kevin@sb.org> --- This patch ditches the quote_words function and uses `git rev-parse --sq-quote "$@"` instead, as suggested by Jonathan Nieder. git-submodule.sh | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/git-submodule.sh b/git-submodule.sh index 9ebbab7..543554b 100755 --- a/git-submodule.sh +++ b/git-submodule.sh @@ -374,7 +374,7 @@ cmd_init() cmd_update() { # parse $args after "submodule ... update". - orig_args="$@" + orig_args="$(git rev-parse --sq-quote "$@")" while test $# -ne 0 do case "$1" in @@ -500,7 +500,7 @@ cmd_update() if test -n "$recursive" then - (clear_local_git_env; cd "$path" && cmd_update $orig_args) || + (clear_local_git_env; cd "$path" && eval cmd_update "$orig_args") || die "Failed to recurse into submodule path '$path'" fi done @@ -733,7 +733,7 @@ cmd_summary() { cmd_status() { # parse $args after "submodule ... status". - orig_args="$@" + orig_args="$(git rev-parse --sq-quote "$@")" while test $# -ne 0 do case "$1" in @@ -790,7 +790,7 @@ cmd_status() prefix="$displaypath/" clear_local_git_env cd "$path" && - cmd_status $orig_args + eval cmd_status "$orig_args" ) || die "Failed to recurse into submodule path '$path'" fi
-- 1.7.3.2.200.g479de