undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'jk/fast-import-marks-cleanup'

Browse Source 
Code clean-up.

* jk/fast-import-marks-cleanup:
  fast-import: remove duplicated option-parsing line
This commit is contained in:
Junio C Hamano 2020-11-02 13:17:40 -08:00
commit 51830654fc
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
builtin/fast-import.c
View File

@ -3399,7 +3399,6 @@ static int parse_one_feature(const char *feature, int from_stream)
option_rewrite_submodules(arg, &sub_marks_to); option_rewrite_submodules(arg, &sub_marks_to);
} else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) { } else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
option_rewrite_submodules(arg, &sub_marks_from); option_rewrite_submodules(arg, &sub_marks_from);
} else if (skip_prefix(feature, "rewrite-submodules-from=", &arg)) {
} else if (!strcmp(feature, "get-mark")) { } else if (!strcmp(feature, "get-mark")) {
; /* Don't die - this feature is supported */ ; /* Don't die - this feature is supported */
} else if (!strcmp(feature, "cat-blob")) { } else if (!strcmp(feature, "cat-blob")) {