git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Morian Sonnet <moriansonnet@gmail.com>
To: sunshine@sunshineco.us, gitgitgadget@gmail.com, git@vger.kernel.org
Cc: MorianSonnet@googlemail.com, gitster@pobox.com
Subject: Re: [PATCH v2 1/1] submodule foreach: fix recursion of options
Date: Tue, 18 Jun 2019 17:15:08 +0200	[thread overview]
Message-ID: <201906181515.x5IFF8bg005587@pool-147-74-zam859.wlan.kfa-juelich.de> (raw)
In-Reply-To: <c46e5bd1403b45d25192220ce689fcd55d897981.1560371293.git.gitgitgadget@gmail.com>

"Morian Sonnet via GitGitGadget" <gitgitgadget@gmail.com> wrote:

I fixed the problem with the test case. Please take another look.

> From: Morian Sonnet <MorianSonnet@googlemail.com>
>
> Calling
>
>     git submodule foreach --recursive git reset --hard
>
> leads to an error stating that the option --hard is unknown to
> submodule--helper.
>
> Reasons:
>
> . Above call is internally translated into
>
>     git submodule--helper foreach --recursive -- git reset --hard
>
> . After calling
>
>     git reset --hard
>
>   inside the first first level submodule,
>
>     git --super-prefix <submodulepath> submodule--helper \
>       foreach --recursive git reset --hard
>
>   is called. Note the missing --.
>
> . Due to the removal of PARSE_OPT_KEEP_UNKNOWN in commit a282f5a906 the
>   option --hard is not passed to
>
>     git reset
>
>   anymore, but leads to git submodule--helper complaining about an
>   unknown option.
>
> Fix:
>
> . Add -- before the command to execute, such that now correctly
>
>     git --super-prefix <submodulepath> submodule--helper \
>       foreach --recursive -- git reset --hard
>
>   is called.
>
> Signed-off-by: Morian Sonnet <moriansonnet@googlemail.com>
> ---
>  builtin/submodule--helper.c  | 1 +
>  t/t7407-submodule-foreach.sh | 7 +++++++
>  2 files changed, 8 insertions(+)
>
> diff --git a/builtin/submodule--helper.c b/builtin/submodule--helper.c
> index 0bf4aa088e..afaf0819c9 100644
> --- a/builtin/submodule--helper.c
> +++ b/builtin/submodule--helper.c
> @@ -540,6 +540,7 @@ static void runcommand_in_submodule_cb(const struct cache_entry *list_item,
>  		if (info->quiet)
>  			argv_array_push(&cpr.args, "--quiet");
>  
> +		argv_array_push(&cpr.args, "--");
>  		argv_array_pushv(&cpr.args, info->argv);
>  
>  		if (run_command(&cpr))
> diff --git a/t/t7407-submodule-foreach.sh b/t/t7407-submodule-foreach.sh
> index 706ae762e0..c554589e6f 100755
> --- a/t/t7407-submodule-foreach.sh
> +++ b/t/t7407-submodule-foreach.sh
> @@ -421,4 +421,11 @@ test_expect_success 'option-like arguments passed to foreach commands are not lo
>  	test_cmp expected actual
>  '
>  
> +test_expect_success 'option-like arguments passed to foreach recurse correctly' '
> +  (
> +    cd super &&
> +    git submodule foreach --recursive git reset --hard
> +  )
> +'
> +
>  test_done
> -- 
> gitgitgadget

  reply	other threads:[~2019-06-18 15:15 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-06-12 18:10 [PATCH 0/1] submodule foreach: fix recursion of options Morian Sonnet via GitGitGadget
2019-06-12 18:10 ` [PATCH 1/1] " Morian Sonnet via GitGitGadget
2019-06-12 19:35   ` Eric Sunshine
2019-06-12 20:28 ` [PATCH v2 0/1] " Morian Sonnet via GitGitGadget
2019-06-12 20:28   ` [PATCH v2 1/1] " Morian Sonnet via GitGitGadget
2019-06-18 15:15     ` Morian Sonnet [this message]
2019-06-19 18:19       ` Johannes Schindelin
2019-06-22 10:54         ` Morian Sonnet
2019-06-24 10:49           ` Johannes Schindelin
2019-06-24 15:40             ` Morian Sonnet
2019-06-24 15:40             ` [PATCH] " Morian Sonnet
2019-06-24 15:47               ` Morian Sonnet
2019-06-24 15:47               ` [PATCH] " Morian Sonnet
2019-06-24 17:47                 ` Johannes Schindelin
2019-06-24 18:16                 ` Junio C Hamano
2019-06-24 20:26                   ` Morian Sonnet
2019-06-24 20:26                   ` [PATCH] " Morian Sonnet
2019-06-25 11:18                     ` Duy Nguyen
2019-06-25 18:18                       ` Junio C Hamano

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

  List information: http://vger.kernel.org/majordomo-info.html

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

  git send-email \
    --in-reply-to=201906181515.x5IFF8bg005587@pool-147-74-zam859.wlan.kfa-juelich.de \
    --to=moriansonnet@gmail.com \
    --cc=MorianSonnet@googlemail.com \
    --cc=git@vger.kernel.org \
    --cc=gitgitgadget@gmail.com \
    --cc=gitster@pobox.com \
    --cc=sunshine@sunshineco.us \
    /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.
Code repositories for project(s) associated with this public inbox

	https://80x24.org/mirrors/git.git

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 read-only IMAP folder(s) and NNTP newsgroup(s).