@matheusbsbs / matheus-bagliano / commits / 17fb00721b

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>

Dmitry Ivankov committed Aug 11, 2011 at 16:21 UTC 17fb00721b854b1c469e44ad709a9cad2128f11d

2 files changed +5 -1

fast-import.c

@@ -1971,6 +1971,10 @@ static char *parse_ident(const char *buf)

1971 size_t name_len;

1972 char *ident;

1973

1974 + /* ensure there is a space delimiter even if there is no name */

1975 + if (*buf == '<')

1976 + --buf;

1977 +

1978 gt = strrchr(buf, '>');

1979 if (!gt)

1980 die("Missing > in ident string: %s", buf);

t/t9300-fast-import.sh

+1 -1

@@ -352,7 +352,7 @@ data <<COMMIT

352 empty commit

353 COMMIT

354 INPUT_END

355 -test_expect_failure 'B: accept and fixup committer with no name' '

355 +test_expect_success 'B: accept and fixup committer with no name' '

356 git fast-import <input &&

357 out=$(git fsck) &&

358 echo "$out" &&