summaryrefslogtreecommitdiff
path: root/ll-merge.h
diff options
context:
space:
mode:
authorLibravatar Dmitry Ivankov <divanorama@gmail.com>2011-08-11 16:21:08 +0600
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-08-11 12:21:03 -0700
commit4b4963c0e1aa094900951df9e66459443111ccc9 (patch)
treeee610335e665fab5ecd99a2e7ff6723c5f48ea69 /ll-merge.h
parentfast-import: don't fail on omitted committer name (diff)
downloadtgif-4b4963c0e1aa094900951df9e66459443111ccc9.tar.xz
fast-import: check committer name more strictly
The documentation declares following identity format: (<name> SP)? LT <email> GT where name is any string without LF and LT characters. But fast-import just accepts any string up to first GT instead of checking the whole format, and moreover just writes it as is to the commit object. git-fsck checks for [^<\n]* <[^<>\n]*> format. Note that the space is mandatory. And the space quirk is already handled via extending the string to the left when needed. Modify fast-import input identity format to a slightly stricter one - deny LF, LT and GT in both <name> and <email>. And check for it. This is stricter then git-fsck as fsck accepts "Name> <email>" currently, but soon fsck check will be adjusted likewise. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'll-merge.h')
0 files changed, 0 insertions, 0 deletions