summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2009-12-30 15:03:48 (GMT)
committerJunio C Hamano <gitster@pobox.com>2009-12-31 22:46:08 (GMT)
commit74fbd1182a8300dd0a1d788120813b6d5b9e5cb6 (patch)
tree9dfb98d148980f6522f3e35883cf51cb5a37bcc6 /fast-import.c
parent63cb8215997fa7bef4319339060869a8c9cee8aa (diff)
downloadgit-74fbd1182a8300dd0a1d788120813b6d5b9e5cb6.zip
git-74fbd1182a8300dd0a1d788120813b6d5b9e5cb6.tar.gz
git-74fbd1182a8300dd0a1d788120813b6d5b9e5cb6.tar.bz2
fast-import: Document author/committer/tagger name is optional
The fast-import parser does not validate that the author, committer or tagger name component contains both a name and an email address. Therefore the name component has always been optional. Correct the documentation to match the implementation. Signed-off-by: Shawn O. Pearce <spearce@spearce.org> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/fast-import.c b/fast-import.c
index dd3c99d..cd87049 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -19,8 +19,8 @@ Format of STDIN stream:
new_commit ::= 'commit' sp ref_str lf
mark?
- ('author' sp name sp '<' email '>' sp when lf)?
- 'committer' sp name sp '<' email '>' sp when lf
+ ('author' (sp name)? sp '<' email '>' sp when lf)?
+ 'committer' (sp name)? sp '<' email '>' sp when lf
commit_msg
('from' sp committish lf)?
('merge' sp committish lf)*
@@ -47,7 +47,7 @@ Format of STDIN stream:
new_tag ::= 'tag' sp tag_str lf
'from' sp committish lf
- ('tagger' sp name sp '<' email '>' sp when lf)?
+ ('tagger' (sp name)? sp '<' email '>' sp when lf)?
tag_msg;
tag_msg ::= data;