git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Daniel Barkalow <barkalow@iabervon.org>,
	Kevin Ballard <kevin@sb.org>,
	Git Mailing List <git@vger.kernel.org>
Subject: Re: [PATCH] builtin-clone: fix initial checkout
Date: Thu, 15 May 2008 06:54:04 -0400	[thread overview]
Message-ID: <20080515105403.GA10592@sigill.intra.peff.net> (raw)
In-Reply-To: <alpine.DEB.1.00.0805151042570.30431@racer>

On Thu, May 15, 2008 at 10:48:25AM +0100, Johannes Schindelin wrote:

> Somewhere in the process of finishing up builtin-clone, the update of
> the working tree was lost.  This was due to not using the option "merge"
> for unpack_trees().

Looking at how "git-checkout" does it made me think that might be
related, but for some reason I didn't try the obvious.

Thanks.

Tested-by: Jeff King <peff@peff.net>

-Peff

  reply	other threads:[~2008-05-15 10:55 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2008-05-15  3:54 git clone broken in next Kevin Ballard
2008-05-15  4:44 ` Jeff King
2008-05-15  4:50   ` Jeff King
2008-05-15  9:48     ` [PATCH] builtin-clone: fix initial checkout Johannes Schindelin
2008-05-15 10:54       ` Jeff King [this message]
2008-05-15 15:17       ` Daniel Barkalow
2008-05-15 19:53       ` Kevin Ballard

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=20080515105403.GA10592@sigill.intra.peff.net \
    --to=peff@peff.net \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=barkalow@iabervon.org \
    --cc=git@vger.kernel.org \
    --cc=kevin@sb.org \
    /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).