From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 May 2011 23:38:16 +0000 (-0700)
Subject: Merge branch 'sr/maint-fast-import-tighten-option-parsing' into maint
X-Git-Tag: v1.7.5.2~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/f7045912f85a1c67f3c997202020dfb26078e978?hp=a8793d2178b8305be55b1c88ac13fbb7dc52a076

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

* sr/maint-fast-import-tighten-option-parsing:
fast-import: fix option parser for no-arg options
---

diff --git a/fast-import.c b/fast-import.c
index 3e4e655bb9..78d978684d 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 */