summaryrefslogtreecommitdiff
path: root/fast-import.c
diff options
context:
space:
mode:
authorDmitry Ivankov <divanorama@gmail.com>2011-08-11 16:21:07 +0600
committerJunio C Hamano <gitster@pobox.com>2011-08-11 12:20:56 -0700
commit17fb00721b854b1c469e44ad709a9cad2128f11d (patch)
tree25ab30762332e2e47c3f90c76a68c962c38d5efe /fast-import.c
parent4cedb78cb5eeb26d6dd47f866b51f061737616f2 (diff)
downloadgit-17fb00721b854b1c469e44ad709a9cad2128f11d.tar.gz
fast-import: don't fail on omitted committer name
fast-import format declares 'committer_name SP' to be optional in 'committer_name SP LT email GT'. But for a (commit) object SP is obligatory while zero length committer_name is ok. git-fsck checks that SP is present, so fast-import must prepend it if the name SP part is omitted. It doesn't do so and thus for "LT email GT" ident it writes a bad object. Name cannot contain LT or GT, ident always comes after SP in fast-import. So if ident starts with LT reuse the SP as if a valid 'SP LT email GT' ident was passed. This fixes a ident parsing bug for a well-formed fast-import input. Though the parsing is still loose and can accept a ill-formed input. Signed-off-by: Dmitry Ivankov <divanorama@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'fast-import.c')
-rw-r--r--fast-import.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/fast-import.c b/fast-import.c
index 78d978684d..c07f155723 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1971,6 +1971,10 @@ static char *parse_ident(const char *buf)
size_t name_len;
char *ident;
+ /* ensure there is a space delimiter even if there is no name */
+ if (*buf == '<')
+ --buf;
+
gt = strrchr(buf, '>');
if (!gt)
die("Missing > in ident string: %s", buf);