{"thread":{"id":"18550","subject":"[PATCH] Correct missing SP characters in grammar comment at top of fast-import.c","startedAt":"2009-03-25T21:22:13Z","lastAt":"2009-03-25T21:26:33Z","messageCount":2,"participants":["newren@gmail.com","Shawn O. Pearce"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"109418","messageId":"1238016133-13509-1-git-send-email-newren@gmail.com","threadId":"18550","inReplyTo":null,"subject":"[PATCH] Correct missing SP characters in grammar comment at top of fast-import.c","fromName":"","fromEmail":"newren@gmail.com","sentAt":"2009-03-25T21:22:13Z","receivedAt":"2009-03-25T21:22:13Z","isPatch":true,"sender":{"key":"newren@gmail.com","avatar":"https://avatars.githubusercontent.com/u/5455730?v=4"},"body":"From: Elijah Newren <newren@gmail.com>\n\n\nSigned-off-by: Elijah Newren <newren@gmail.com>\n---\n\nSome point after discovering this 'bug', I noticed that the documentation\nin Documentation/git-fast-import.txt was accurate, so I added a comment at\nthe top of the file pointing people at that document, as I suspect it is\nmore likely to be kept up to date.  If my assumption is wrong, or would\nprefer different wording, I'm all ears.\n\n fast-import.c |    7 ++++---\n 1 files changed, 4 insertions(+), 3 deletions(-)\n\ndiff --git a/fast-import.c b/fast-import.c\nindex beeac0d..db44da3 100644\n--- a/fast-import.c\n+++ b/fast-import.c\n@@ -1,4 +1,5 @@\n /*\n+(See Documentation/git-fast-import.txt for maintained documentation.)\n Format of STDIN stream:\n \n   stream ::= cmd*;\n@@ -18,8 +19,8 @@ Format of STDIN stream:\n \n   new_commit ::= 'commit' sp ref_str lf\n     mark?\n-    ('author' sp name '<' email '>' when lf)?\n-    'committer' sp name '<' email '>' when lf\n+    ('author' sp name sp '<' email '>' sp when lf)?\n+    'committer' sp name sp '<' email '>' sp when lf\n     commit_msg\n     ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?\n     ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*\n@@ -43,7 +44,7 @@ Format of STDIN stream:\n \n   new_tag ::= 'tag' sp tag_str lf\n     'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf\n-    ('tagger' sp name '<' email '>' when lf)?\n+    ('tagger' sp name sp '<' email '>' sp when lf)?\n     tag_msg;\n   tag_msg ::= data;\n \n-- \n1.6.0.6\n"},{"id":"109420","messageId":"20090325212633.GB23521@spearce.org","threadId":"18550","inReplyTo":"1238016133-13509-1-git-send-email-newren@gmail.com","subject":"Re: [PATCH] Correct missing SP characters in grammar comment at top of fast-import.c","fromName":"Shawn O. Pearce","fromEmail":"spearce@spearce.org","sentAt":"2009-03-25T21:26:33Z","receivedAt":"2009-03-25T21:26:33Z","isPatch":true,"sender":{"key":"spearce@spearce.org","avatar":"https://avatars.githubusercontent.com/u/34844?v=4"},"body":"newren@gmail.com wrote:\n> From: Elijah Newren <newren@gmail.com>\n> \n> Signed-off-by: Elijah Newren <newren@gmail.com>\n\nAcked-by: Shawn O. Pearce <spearce@spearce.org>\n\n> Some point after discovering this 'bug', I noticed that the documentation\n> in Documentation/git-fast-import.txt was accurate, so I added a comment at\n> the top of the file pointing people at that document, as I suspect it is\n> more likely to be kept up to date.  If my assumption is wrong, or would\n> prefer different wording, I'm all ears.\n\nGood catch.  The grammar at the top of the file should be more\naccurate than the documentation you point to.  This was just a\nthinko when I wrote the grammar out in the header.\n\n\n> diff --git a/fast-import.c b/fast-import.c\n> index beeac0d..db44da3 100644\n> --- a/fast-import.c\n> +++ b/fast-import.c\n> @@ -1,4 +1,5 @@\n>  /*\n> +(See Documentation/git-fast-import.txt for maintained documentation.)\n>  Format of STDIN stream:\n>  \n>    stream ::= cmd*;\n> @@ -18,8 +19,8 @@ Format of STDIN stream:\n>  \n>    new_commit ::= 'commit' sp ref_str lf\n>      mark?\n> -    ('author' sp name '<' email '>' when lf)?\n> -    'committer' sp name '<' email '>' when lf\n> +    ('author' sp name sp '<' email '>' sp when lf)?\n> +    'committer' sp name sp '<' email '>' sp when lf\n>      commit_msg\n>      ('from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)?\n>      ('merge' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf)*\n> @@ -43,7 +44,7 @@ Format of STDIN stream:\n>  \n>    new_tag ::= 'tag' sp tag_str lf\n>      'from' sp (ref_str | hexsha1 | sha1exp_str | idnum) lf\n> -    ('tagger' sp name '<' email '>' when lf)?\n> +    ('tagger' sp name sp '<' email '>' sp when lf)?\n>      tag_msg;\n>    tag_msg ::= data;\n>  \n> -- \n> 1.6.0.6\n> \n\n-- \nShawn.\n"}]}