From: Sverre Rabbelier Date: Thu, 5 May 2011 18:56:00 +0000 (+0200) Subject: fast-import: fix option parser for no-arg options X-Git-Tag: v1.7.5.2~6^2 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4cce4ef2d5b2a3be1ddb17e9aa12b3307900b41d;p=git.git fast-import: fix option parser for no-arg options While refactoring the options parser in bc3c79a (fast-import: add (non-)relative-marks feature, 2009-12-04), it was made too lenient for options that take no argument, fix that. Signed-off-by: Sverre Rabbelier Signed-off-by: Junio C Hamano --- diff --git a/fast-import.c b/fast-import.c index 3e4e655bb..78d978684 100644 --- a/fast-import.c +++ b/fast-import.c @@ -3135,11 +3135,11 @@ static int parse_one_feature(const char *feature, int from_stream) option_export_marks(feature + 13); } else if (!strcmp(feature, "cat-blob")) { ; /* Don't die - this feature is supported */ - } else if (!prefixcmp(feature, "relative-marks")) { + } else if (!strcmp(feature, "relative-marks")) { relative_marks_paths = 1; - } else if (!prefixcmp(feature, "no-relative-marks")) { + } else if (!strcmp(feature, "no-relative-marks")) { relative_marks_paths = 0; - } else if (!prefixcmp(feature, "force")) { + } else if (!strcmp(feature, "force")) { force_update = 1; } else if (!strcmp(feature, "notes") || !strcmp(feature, "ls")) { ; /* do nothing; we have the feature */