newren@xxxxxxxxx wrote:
> From: Elijah Newren <newren@xxxxxxxxx>
>
> Signed-off-by: Elijah Newren <newren@xxxxxxxxx>
Acked-by: Shawn O. Pearce <spearce@xxxxxxxxxxx>
> Some point after discovering this 'bug', I noticed that the documentation
> in Documentation/git-fast-import.txt was accurate, so I added a comment at
> the top of the file pointing people at that document, as I suspect it is
> more likely to be kept up to date. If my assumption is wrong, or would
> prefer different wording, I'm all ears.
Good catch. The grammar at the top of the file should be more
accurate than the documentation you point to. This was just a
thinko when I wrote the grammar out in the header.
> diff --git a/fast-import.c b/fast-import.c
> index beeac0d..db44da3 100644
> --- a/fast-import.c
> +++ b/fast-import.c
> @@ -1,4 +1,5 @@
> /*
> +(See Documentation/git-fast-import.txt for maintained documentation.)
> Format of STDIN stream:
>
> stream ::= cmd*;
> @@ -18,8 +19,8 @@ Format of STDIN stream:
>
> new_commit ::= 'commit' sp ref_str lf
> mark?
> - ('author' sp name '<' email '>' when lf)?
> - 'committer' sp name '<' email '>' when lf
> + ('author' sp name sp '<' email '>' sp when lf)?
> + 'committer' sp name sp '<' email '>' sp when lf
> commit_msg
> ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?
> ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*
> @@ -43,7 +44,7 @@ Format of STDIN stream:
>
> new_tag ::= 'tag' sp tag_str lf
> 'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf
> - ('tagger' sp name '<' email '>' when lf)?
> + ('tagger' sp name sp '<' email '>' sp when lf)?
> tag_msg;
> tag_msg ::= data;
>
> --
> 1.6.0.6
>
--
Shawn.
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
