# [PATCH] fast-import: remove duplicated option-parsing line 3 messages from 2020-10-15 to 2020-10-17. Participants: Jeff King, Junio C Hamano, brian m. carlson. Thread: https://gitlist.dev/t/54432 ## Jeff King, 2020-10-15 19:34 Subject: [PATCH] fast-import: remove duplicated option-parsing line Message-ID: <20201015193411.GA1130491@coredump.intra.peff.net> URL: https://gitlist.dev/e/20201015193411.GA1130491%40coredump.intra.peff.net ``` 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. Signed-off-by: Jeff King --- 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")) { -- 2.29.0.rc1.562.g7bd9bc8902 ``` ## Junio C Hamano, 2020-10-16 15:49 Subject: Re: [PATCH] fast-import: remove duplicated option-parsing line Message-ID: URL: https://gitlist.dev/e/xmqqblh2dvbx.fsf%40gitster.c.googlers.com In-Reply-To: <20201015193411.GA1130491@coredump.intra.peff.net> ``` Jeff King 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 > --- > 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")) { ``` ## brian m. carlson, 2020-10-17 23:08 Subject: Re: [PATCH] fast-import: remove duplicated option-parsing line Message-ID: <20201017230840.GH490427@camp.crustytoothpaste.net> URL: https://gitlist.dev/e/20201017230840.GH490427%40camp.crustytoothpaste.net In-Reply-To: <20201015193411.GA1130491@coredump.intra.peff.net> ``` On 2020-10-15 at 19:34:11, Jeff King wrote: > 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. > > Signed-off-by: Jeff King This seems clearly correct. -- brian m. carlson (he/him or they/them) Houston, Texas, US ```