diff options
| author |  Jeff King <peff@peff.net> | 2020-10-15 15:34:11 -0400 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2020-10-16 08:48:47 -0700 |
| commit | 6db29ab21346aee75f975fd27e4e87b423ed8476 (patch) | |
| tree | 278e08308f81297f8ca19ac7446715314be0d88b /builtin | |
| parent | Git 2.29-rc2 (diff) | |
| download | tgif-6db29ab21346aee75f975fd27e4e87b423ed8476.tar.xz | |
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 <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'builtin')
| -rw-r--r-- | builtin/fast-import.c | 1 |
1 files changed, 0 insertions, 1 deletions
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")) { |