From: Dmitry Ivankov <divanorama@gmail.com>
To: git@vger.kernel.org
Cc: Jonathan Nieder <jrnieder@gmail.com>, Jeff King <peff@peff.net>,
Sverre Rabbelier <srabbelier@gmail.com>,
Shawn Pearce <spearce@spearce.org>,
Dmitry Ivankov <divanorama@gmail.com>
Subject: [PATCH v2 2/3] fast-import: allow "merge $null_sha1" command
Date: Wed, 27 Jun 2012 23:40:24 +0600 [thread overview]
Message-ID: <1340818825-13754-3-git-send-email-divanorama@gmail.com> (raw)
In-Reply-To: <1340818825-13754-1-git-send-email-divanorama@gmail.com>
"from $null_sha1" and "merge $empty_branch" are already allowed so
allow "merge $null_sha1" command too.
However such 'merge' has no effect on the import. It's made allowed
just to unify null_sha1 commits handling a little bit.
Signed-off-by: Dmitry Ivankov <divanorama@gmail.com>
---
fast-import.c | 14 ++++++++------
t/t9300-fast-import.sh | 1 +
2 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/fast-import.c b/fast-import.c
index 419e435..f03da1e 100644
--- a/fast-import.c
+++ b/fast-import.c
@@ -2631,12 +2631,14 @@ static struct hash_list *parse_merge(unsigned int *count)
die("Mark :%" PRIuMAX " not a commit", idnum);
hashcpy(n->sha1, oe->idx.sha1);
} else if (!get_sha1(from, n->sha1)) {
- unsigned long size;
- char *buf = read_object_with_reference(n->sha1,
- commit_type, &size, n->sha1);
- if (!buf || size < 46)
- die("Not a valid commit: %s", from);
- free(buf);
+ if (!is_null_sha1(n->sha1)) {
+ unsigned long size;
+ char *buf = read_object_with_reference(n->sha1,
+ commit_type, &size, n->sha1);
+ if (!buf || size < 46)
+ die("Not a valid commit: %s", from);
+ free(buf);
+ }
} else
die("Invalid ref name or SHA1 expression: %s", from);
diff --git a/t/t9300-fast-import.sh b/t/t9300-fast-import.sh
index 5716420..6f4c988 100755
--- a/t/t9300-fast-import.sh
+++ b/t/t9300-fast-import.sh
@@ -864,6 +864,7 @@ Merge J3, J4 into fresh J5.
COMMIT
merge refs/heads/J3
merge refs/heads/J4
+merge 0000000000000000000000000000000000000000
INPUT_END
test_expect_success \
--
1.7.3.4
next prev parent reply other threads:[~2012-06-27 17:39 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-27 17:40 [PATCH/RFC v2 0/3] fast-import: disallow empty branches as parents Dmitry Ivankov
2012-06-27 17:40 ` [PATCH v2 1/3] fast-import: do not write null_sha1 as a merge parent Dmitry Ivankov
2012-06-27 21:25 ` Jonathan Nieder
2012-07-24 19:30 ` Jonathan Nieder
2012-06-27 17:40 ` Dmitry Ivankov [this message]
2012-06-27 21:33 ` [PATCH v2 2/3] fast-import: allow "merge $null_sha1" command Jonathan Nieder
2012-06-27 22:30 ` Junio C Hamano
2012-06-27 23:39 ` Jonathan Nieder
2012-07-23 1:28 ` Jonathan Nieder
2012-06-27 17:40 ` [PATCH v2 3/3] fast-import: disallow "merge $itself" command Dmitry Ivankov
2012-06-27 21:22 ` Jonathan Nieder
2012-07-24 19:40 ` Jonathan Nieder
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=1340818825-13754-3-git-send-email-divanorama@gmail.com \
--to=divanorama@gmail.com \
--cc=git@vger.kernel.org \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
--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.