diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:40 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-02 13:17:40 -0800 |
| commit | 51830654fc0530d0807da453e454ea6aeddc4919 (patch) | |
| tree | 03224fa19575e01b1b06a081cb50a57daf743042 | |
| parent | Merge branch 'lo/zsh-completion' (diff) | |
| parent | fast-import: remove duplicated option-parsing line (diff) | |
| download | tgif-51830654fc0530d0807da453e454ea6aeddc4919.tar.xz | |
Merge branch 'jk/fast-import-marks-cleanup'
Code clean-up.
* jk/fast-import-marks-cleanup:
fast-import: remove duplicated option-parsing line
| -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 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")) { |