From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Thomas Rast" <trast@inf.ethz.ch>,
"Stefan Schüßler" <mail@stefanschuessler.de>,
git@vger.kernel.org
Subject: Re: [PATCH v2] pull: merge into unborn by fast-forwarding from empty tree
Date: Thu, 20 Jun 2013 16:55:33 -0400 [thread overview]
Message-ID: <20130620205533.GA8074@sigill.intra.peff.net> (raw)
In-Reply-To: <7vmwqkqzhy.fsf@alter.siamese.dyndns.org>
On Thu, Jun 20, 2013 at 01:49:13PM -0700, Junio C Hamano wrote:
> > But read-tree already does
> > the hard work for us, so I don't think it is a lot of code either way.
>
> OK, I just got an impression from reading the back-and-forth between
> you two that read-tree does not want to deal with that case.
I think I got us off-track with my expectation of ending the one case
with a conflicted index. But caring about that is even more unlikely. I
think Thomas's original patch is probably a happy medium.
As an orthogonal matter, we probably should reverse the order of
updating HEAD and the index/working tree, as it does not make much sense
to me to do the former if the latter is not possible (and that is the
case even with the current code).
-Peff
next prev parent reply other threads:[~2013-06-20 20:55 UTC|newest]
Thread overview: 20+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-20 12:36 [PATCH] pull: pull into void by fast-forwarding from empty tree Thomas Rast
2013-06-20 12:47 ` Jeff King
2013-06-20 13:06 ` [PATCH v2] pull: merge into unborn " Thomas Rast
2013-06-20 13:15 ` Jeff King
2013-06-20 13:20 ` Thomas Rast
2013-06-20 13:33 ` Thomas Rast
2013-06-20 13:47 ` Jeff King
2013-06-20 14:29 ` Thomas Rast
2013-06-20 14:22 ` Thomas Rast
2013-06-20 18:43 ` Junio C Hamano
2013-06-20 20:19 ` Jeff King
2013-06-20 20:49 ` Junio C Hamano
2013-06-20 20:55 ` Jeff King [this message]
2013-06-20 21:45 ` Junio C Hamano
2013-06-20 22:03 ` Jeff King
2013-06-20 22:35 ` [PATCHv3 0/2] pull into unborn branch safety tree Jeff King
2013-06-20 22:36 ` [PATCH 1/2] pull: update unborn branch tip after index Jeff King
2013-06-20 22:38 ` [PATCH 2/2] pull: merge into unborn by fast-forwarding from empty tree Jeff King
2013-06-20 22:52 ` [PATCHv3 0/2] pull into unborn branch safety tree Junio C Hamano
2013-06-20 16:04 ` [PATCH] pull: pull into void by fast-forwarding from empty tree Ramkumar Ramachandra
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=20130620205533.GA8074@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=mail@stefanschuessler.de \
--cc=trast@inf.ethz.ch \
/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).