Re: [PATCH] git-fast-import.txt:...

Re: [PATCH] git-fast-import.txt: --relative-marks takes no parameter

From: Junio C Hamano <hidden>
Date: 2016-06-15 22:51:10

Michael J Gruber [off-list ref] 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.

quoted hunk

Signed-off-by: Michael J Gruber <redacted>
---
 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=<fd>::

[PATCH] fast-import: fix option parser forno-arg options

From: Sverre Rabbelier <hidden>
Date: 2016-06-15 22:51:10

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 <redacted>
---

  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

`h`	back out one level
`j`	next message in thread
`k`	previous message in thread
`l`	drill in
`Esc`	close help / fold thread tree
`?`	toggle this help