From: Jonathan Nieder <jrnieder@gmail.com>
To: Dmitry Ivankov <divanorama@gmail.com>
Cc: git@vger.kernel.org, Jeff King <peff@peff.net>,
Sverre Rabbelier <srabbelier@gmail.com>,
Shawn Pearce <spearce@spearce.org>
Subject: Re: [PATCH v2 3/3] fast-import: disallow "merge $itself" command
Date: Wed, 27 Jun 2012 16:22:31 -0500 [thread overview]
Message-ID: <20120627212231.GM12774@burratino> (raw)
In-Reply-To: <1340818825-13754-4-git-send-email-divanorama@gmail.com>
Dmitry Ivankov wrote:
> "merge $itself" may be used to create commits with previous branch tip
> being repeated as n-th parent or even moved from being 1-st to be just
> n-th. This is not a documented use case and doesn't look like a common
> one.
[...]
> Just deny "merge $itself" for now. It was a bit broken and btw "from
> $itself" was and is a forbidden command too.
Lovely. Thanks for a clear patch and clear explanation.
For what it's worth, this one is
Acked-by: Jonathan Nieder <jrnieder@gmail.com>
I'll think more about the other two and get back to you.
next prev parent reply other threads:[~2012-06-27 21:22 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 ` [PATCH v2 2/3] fast-import: allow "merge $null_sha1" command Dmitry Ivankov
2012-06-27 21:33 ` 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 [this message]
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=20120627212231.GM12774@burratino \
--to=jrnieder@gmail.com \
--cc=divanorama@gmail.com \
--cc=git@vger.kernel.org \
--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 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).