From: Dmitry Ivankov <divanorama@gmail.com>
To: git@vger.kernel.org
Cc: SASAKI Suguru <sss.sonik@gmail.com>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: [PATCH 2/5] fast-import: don't fail on omitted committer name
Date: Thu, 28 Jul 2011 11:44:01 +0600 [thread overview]
Message-ID: <1311831844-13123-3-git-send-email-divanorama@gmail.com> (raw)
In-Reply-To: <1311831844-13123-1-git-send-email-divanorama@gmail.com>
fast-import format declares 'committer_name SP' to be optional. But SP
between empty or not name and a email is obligatory and checked by
git-fsck, so fast-import must prepend the SP if the name is omitted.
Currently it doesn't.
Name cannot contain LT or GT and ident always comes after SP in
fast-import. So reuse that SP as if a valid 'SP <email>' 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>
---
fast-import.c | 4 ++++
t/t9300-fast-import.sh | 2 +-
2 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 9e8d186..3194f4e 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -1972,6 +1972,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);
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index a659dd4..09ef6ba 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -352,7 +352,7 @@ data <<COMMIT
empty commit
COMMIT
INPUT_END
-test_expect_failure 'B: accept and fixup committer with no name' '
+test_expect_success 'B: accept and fixup committer with no name' '
git fast-import <input &&
out=$(git fsck) &&
echo "$out" &&
--
1.7.3.4
next prev parent reply other threads:[~2011-07-28 5:41 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-28 5:43 [PATCH 0/5] fixes for committer/author parsing/check Dmitry Ivankov
2011-07-28 5:44 ` [PATCH 1/5] fast-import: add input format tests Dmitry Ivankov
2011-07-28 5:44 ` Dmitry Ivankov [this message]
2011-08-02 16:53 ` [PATCH 2/5] fast-import: don't fail on omitted committer name Junio C Hamano
2011-08-02 17:07 ` Dmitry Ivankov
2011-07-28 5:44 ` [PATCH 3/5] fast-import: check committer name more strictly Dmitry Ivankov
2011-08-02 17:01 ` Junio C Hamano
2011-07-28 5:44 ` [PATCH 4/5] fsck: add a few committer name tests Dmitry Ivankov
2011-07-28 5:44 ` [PATCH 5/5] fsck: improve committer/author check Dmitry Ivankov
2011-08-02 17:00 ` Junio C Hamano
2011-08-02 19:50 ` Dmitry Ivankov
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1311831844-13123-3-git-send-email-divanorama@gmail.com \
--to=divanorama@gmail.com \
--cc=git@vger.kernel.org \
--cc=sss.sonik@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).