From: Jeff King Date: Thu, 15 Oct 2020 19:34:11 +0000 (-0400) Subject: fast-import: remove duplicated option-parsing line X-Git-Tag: v2.30.0-rc0~132^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6db29ab21346aee75f975fd27e4e87b423ed8476;p=thirdparty%2Fgit.git fast-import: remove duplicated option-parsing line 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 Signed-off-by: Junio C Hamano --- diff --git a/builtin/fast-import.c b/builtin/fast-import.c index 1bf50a73dc..6615729d43 100644 --- a/builtin/fast-import.c +++ b/builtin/fast-import.c @@ -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")) {