From: Dmitry Ivankov <divanorama@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>,
"Shawn O. Pearce" <spearce@spearce.org>,
David Barr <davidbarr@google.com>,
Sverre Rabbelier <srabbelier@gmail.com>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: [PATCH/RFC 0/2] fast-import: commit from null_sha1
Date: Mon, 19 Sep 2011 03:20:44 +0600 [thread overview]
Message-ID: <1316380846-15845-1-git-send-email-divanorama@gmail.com> (raw)
Not so sure how null_sha1 parent should be treated in fast-import.
Absent parent is represented as null_sha1 to the user in reflog,
but isn't allowed as an argument for porcelain nor shows in most
plumbing commands afaik.
These patches make fast-import treat
commit refs/heads/master
...
from `null_sha1`
like any other missing parent sha1 - reject such input.
Note: if we'll want this input to be valid, some other adjustments
to fast-import logic may be needed for consistency.
Dmitry Ivankov (2):
fast-import: add 'commit from 0{40}' failing test
fast-import: fix 'from 0{40}' test
fast-import.c | 17 ++++++-----------
t/t9300-fast-import.sh | 12 ++++++++++++
2 files changed, 18 insertions(+), 11 deletions(-)
--
1.7.3.4
next reply other threads:[~2011-09-18 21:14 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-09-18 21:20 Dmitry Ivankov [this message]
2011-09-18 21:20 ` [PATCH 1/2] fast-import: add 'commit from 0{40}' failing test Dmitry Ivankov
2011-09-18 21:20 ` [PATCH 2/2] fast-import: fix 'from 0{40}' test Dmitry Ivankov
2011-09-18 21:30 ` [PATCH/RFC 0/2] fast-import: commit from null_sha1 Jonathan Nieder
2011-09-18 21:40 ` 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=1316380846-15845-1-git-send-email-divanorama@gmail.com \
--to=divanorama@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=spearce@spearce.org \
--cc=srabbelier@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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.