[PATCH] Correct missing SP characters in grammar comment at top of fast-import.c

[PATCH] Correct missing SP characters in grammar comment at top of fast-import.c

[newren]

From: Elijah Newren <newren@gmail.com>


Signed-off-by: Elijah Newren <newren@gmail.com>
---

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.

 fast-import.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

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

Re: [PATCH] Correct missing SP characters in grammar comment at top of fast-import.c

[Shawn O. Pearce]

newren@gmail.com wrote:
> From: Elijah Newren <newren@gmail.com>
> 
> Signed-off-by: Elijah Newren <newren@gmail.com>

Acked-by: Shawn O. Pearce <spearce@spearce.org>

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