# [PATCH] git-fast-import.txt: --relative-marks takes no parameter 3 messages from 2011-05-05 to 2011-05-05. Participants: Michael J Gruber, Junio C Hamano, Sverre Rabbelier. Thread: https://gitlist.dev/t/27264 ## Michael J Gruber, 2011-05-05 09:13 Subject: [PATCH] git-fast-import.txt: --relative-marks takes no parameter Message-ID: URL: https://gitlist.dev/e/a1f7a117ba4deff49c7462f62e1be5da500540fb.1304586800.git.git%40drmicha.warpmail.net ``` Remove spurious "=" after --relative-marks. Signed-off-by: Michael J Gruber --- Documentation/git-fast-import.txt | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt index 2c2ea12..249249a 100644 --- a/Documentation/git-fast-import.txt +++ b/Documentation/git-fast-import.txt @@ -83,7 +83,7 @@ OPTIONS skips the file if it does not exist. --relative-marks:: - After specifying --relative-marks= the paths specified + After specifying --relative-marks the paths specified with --import-marks= and --export-marks= are relative to an internal directory in the current repository. In git-fast-import this means that the paths are relative @@ -93,7 +93,7 @@ OPTIONS --no-relative-marks:: Negates a previous --relative-marks. Allows for combining relative and non-relative marks by interweaving - --(no-)-relative-marks= with the --(import|export)-marks= + --(no-)-relative-marks with the --(import|export)-marks= options. --cat-blob-fd=:: -- 1.7.5.1.336.g3803d ``` ## Junio C Hamano, 2011-05-05 17:18 Subject: Re: [PATCH] git-fast-import.txt: --relative-marks takes no parameter Message-ID: <7v7ha59icw.fsf@alter.siamese.dyndns.org> URL: https://gitlist.dev/e/7v7ha59icw.fsf%40alter.siamese.dyndns.org In-Reply-To: ``` Michael J Gruber writes: > Remove spurious "=" after --relative-marks. "fast-import" does accept --relative-marks= (or --relative-marksmith for that matter), I think, as its parser added in bc3c79a (fast-import: add (non-)relative-marks feature, 2009-12-04) is broken and uses prefixcmp() when parsing the command line. Sverre may want to fix it. But your patch is the right thing to do anyway, as I think this option never meant to accept any option argument. Will apply. Thanks. > Signed-off-by: Michael J Gruber > --- > Documentation/git-fast-import.txt | 4 ++-- > 1 files changed, 2 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-fast-import.txt b/Documentation/git-fast-import.txt > index 2c2ea12..249249a 100644 > --- a/Documentation/git-fast-import.txt > +++ b/Documentation/git-fast-import.txt > @@ -83,7 +83,7 @@ OPTIONS > skips the file if it does not exist. > > --relative-marks:: > - After specifying --relative-marks= the paths specified > + After specifying --relative-marks the paths specified > with --import-marks= and --export-marks= are relative > to an internal directory in the current repository. > In git-fast-import this means that the paths are relative > @@ -93,7 +93,7 @@ OPTIONS > --no-relative-marks:: > Negates a previous --relative-marks. Allows for combining > relative and non-relative marks by interweaving > - --(no-)-relative-marks= with the --(import|export)-marks= > + --(no-)-relative-marks with the --(import|export)-marks= > options. > > --cat-blob-fd=:: ``` ## Sverre Rabbelier, 2011-05-05 18:56 Subject: [PATCH] fast-import: fix option parser forno-arg options Message-ID: <1304621760-22261-1-git-send-email-srabbelier@gmail.com> URL: https://gitlist.dev/e/1304621760-22261-1-git-send-email-srabbelier%40gmail.com In-Reply-To: <7v7ha59icw.fsf@alter.siamese.dyndns.org> ``` 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 --- I noticed that force was also wrong. All other option parsing checks are made using the right version though. fast-import.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/fast-import.c b/fast-import.c index 3e4e655..78d9786 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 */ -- 1.7.5.1.292.g728120 ```