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

Merge branch 'sr/maint-fast-import-tighten-option-parsing'

Browse Source 
* sr/maint-fast-import-tighten-option-parsing:
  fast-import: fix option parser for no-arg options
This commit is contained in:
Junio C Hamano 2011-05-11 11:37:41 -07:00
commit 9cd805de61
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fast-import.c
View File

@ -3135,11 +3135,11 @@ static int parse_one_feature(const char *feature, int from_stream)
option_export_marks(feature + 13); option_export_marks(feature + 13);
} else if (!strcmp(feature, "cat-blob")) { } else if (!strcmp(feature, "cat-blob")) {
; /* Don't die - this feature is supported */ ; /* Don't die - this feature is supported */
} else if (!prefixcmp(feature, "relative-marks")) { } else if (!strcmp(feature, "relative-marks")) {
relative_marks_paths = 1; relative_marks_paths = 1;
} else if (!prefixcmp(feature, "no-relative-marks")) { } else if (!strcmp(feature, "no-relative-marks")) {
relative_marks_paths = 0; relative_marks_paths = 0;
} else if (!prefixcmp(feature, "force")) { } else if (!strcmp(feature, "force")) {
force_update = 1; force_update = 1;
} else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) { } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) {
; /* do nothing; we have the feature */ ; /* do nothing; we have the feature */