]> git.ipfire.org Git - thirdparty/git.git/commitdiff
fast-import: remove duplicated option-parsing line
authorJeff King <peff@peff.net>
Thu, 15 Oct 2020 19:34:11 +0000 (15:34 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 16 Oct 2020 15:48:47 +0000 (08:48 -0700)
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/fast-import.c

index 1bf50a73dc3597394ecf73e5a786fe217e7ef633..6615729d43f90648eef1e9a610dc075716a7514a 100644 (file)
@@ -3396,7 +3396,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")) {