From 6db29ab21346aee75f975fd27e4e87b423ed8476 Mon Sep 17 00:00:00 2001 From: Jeff King Date: Thu, 15 Oct 2020 15:34:11 -0400 Subject: 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 --- builtin/fast-import.c | 1 - 1 file changed, 1 deletion(-) 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")) { -- cgit v1.2.3