From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: git@vger.kernel.org, "brian m. carlson" <sandals@crustytoothpaste.net>
Subject: Re: [PATCH] fast-import: remove duplicated option-parsing line
Date: Fri, 16 Oct 2020 08:49:54 -0700 [thread overview]
Message-ID: <xmqqblh2dvbx.fsf@gitster.c.googlers.com> (raw)
In-Reply-To: <20201015193411.GA1130491@coredump.intra.peff.net> (Jeff King's message of "Thu, 15 Oct 2020 15:34:11 -0400")
Jeff King <peff@peff.net> writes:
> Commit 1bdca81641 (fast-import: add options for rewriting submodules,
> 2020-02-22) accidentally added two lines parsing the option
> "rewrite-submodules-from". This didn't do anything in practice, because
> they're in an if/else chain and so the second one can never trigger.
Thanks; it is embarrassing of me that I didn't see it while
applying.
>
> Signed-off-by: Jeff King <peff@peff.net>
> ---
> Another tidbit I noticed in my foray into fast-import earlier today.
>
> builtin/fast-import.c | 1 -
> 1 file changed, 1 deletion(-)
>
> diff --git a/builtin/fast-import.c b/builtin/fast-import.c
> index 70d7d25eed..dd4d09cece 100644
> --- a/builtin/fast-import.c
> +++ b/builtin/fast-import.c
> @@ -3399,7 +3399,6 @@ static int parse_one_feature(const char *feature, int from_stream)
> option_rewrite_submodules(arg, &sub_marks_to);
> } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
> option_rewrite_submodules(arg, &sub_marks_from);
> - } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
> } else if (!strcmp(feature, "get-mark")) {
> ; /* Don't die - this feature is supported */
> } else if (!strcmp(feature, "cat-blob")) {
next prev parent reply other threads:[~2020-10-16 15:49 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-15 19:34 [PATCH] fast-import: remove duplicated option-parsing line Jeff King
2020-10-16 15:49 ` Junio C Hamano [this message]
2020-10-17 23:08 ` brian m. carlson
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
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqblh2dvbx.fsf@gitster.c.googlers.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
--cc=sandals@crustytoothpaste.net \
/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.
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 NNTP newsgroup(s).