git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
Junio C Hamano <gitster@pobox.com>
Date
May 5, 2011, 17:18 UTC
Message-ID
<7v7ha59icw.fsf@alter.siamese.dyndns.org>
In-Reply-To
<a1f7a117ba4deff49c7462f62e1be5da500540fb.1304586800.git.git@drmicha.warpmail.net>
Michael J Gruber <git@drmicha.warpmail.net> 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.
Show 27 quoted lines
> Signed-off-by: Michael J Gruber <git@drmicha.warpmail.net>
> ---
>  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>::
Previous: Michael J GruberNext: Sverre Rabbelier
Message 2 of 3 in “git-fast-import.txt: --relative-marks takes no parameter”
  1. git-fast-import.txt: --relative-marks takes no parameterMichael J Gruber, May 5, 2011
  2. Junio C HamanoMay 5, 2011
  3. fast-import: fix option parser forno-arg optionsSverre Rabbelier, May 5, 2011

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.