summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9fee24c)
raw | patch | inline | side by side (parent: 9fee24c)
author | Sverre Rabbelier <srabbelier@gmail.com> | |
Thu, 5 May 2011 18:56:00 +0000 (20:56 +0200) | ||
committer | Junio C Hamano <gitster@pobox.com> | |
Fri, 6 May 2011 04:21:24 +0000 (21:21 -0700) |
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 <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
(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 <srabbelier@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
fast-import.c | patch | blob | history |
diff --git a/fast-import.c b/fast-import.c
index 3e4e655bb989076e4bb6311fa4fe41320c344194..78d978684da2e2b79340c138e1b6300100df1221 100644 (file)
--- a/fast-import.c
+++ b/fast-import.c
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 */