aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-16 16:38:16 -0700
committerJunio C Hamano <gitster@pobox.com>2011-05-16 16:38:16 -0700
commitf7045912f85a1c67f3c997202020dfb26078e978 (patch)
tree3712da79fda537dd3a9f128fa909cf4ca279307c
parenta8793d2178b8305be55b1c88ac13fbb7dc52a076 (diff)
parent4cce4ef2d5b2a3be1ddb17e9aa12b3307900b41d (diff)
downloadgit-f7045912f85a1c67f3c997202020dfb26078e978.tar.gz
git-f7045912f85a1c67f3c997202020dfb26078e978.tar.xz
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
-rw-r--r--fast-import.c6
1 files changed, 3 insertions, 3 deletions
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 */