From: "Shawn O. Pearce" <spearce@spearce.org>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: Daniel Barkalow <barkalow@iabervon.org>,
Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org
Subject: Re: [PATCH v2] Fix fetch/pull when run without --update-head-ok
Date: Tue, 14 Oct 2008 08:02:27 -0700 [thread overview]
Message-ID: <20081014150227.GC4856@spearce.org> (raw)
In-Reply-To: <alpine.DEB.1.00.0810141145491.22125@pacific.mpi-cbg.de.mpi-cbg.de>
Johannes Schindelin <Johannes.Schindelin@gmx.de> wrote:
> On Mon, 13 Oct 2008, Daniel Barkalow wrote:
>
> > On Mon, 13 Oct 2008, Johannes Schindelin wrote:
> >
> > > I actually understand now why the tests started failing: the change from
> > > resolve_ref() to get_branch() as requested by Daniel are at fault:
> > > get_branch() does not check if the branch has an initial commit.
>
> So, my vote is to revert back to resolve_ref(), even if it needs more
> lines.
Yes, I agree, resolve_ref() is the best thing to be using here,
even if it is more code. get_branch() validates the commit and we
don't want that. We really just want to know if the current branch
is going to be updated, we don't care to what/why.
--
Shawn.
next prev parent reply other threads:[~2008-10-14 15:03 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-10-11 11:38 [PATCH] fetch: refuse to fetch into the current branch in a non-bare repository Johannes Schindelin
2008-10-11 21:44 ` Junio C Hamano
2008-10-12 18:47 ` Shawn O. Pearce
2008-10-13 9:28 ` Johannes Schindelin
2008-10-12 18:52 ` Shawn O. Pearce
2008-10-12 20:37 ` Daniel Barkalow
2008-10-13 9:36 ` [PATCH v2] Fix fetch/pull when run without --update-head-ok Johannes Schindelin
2008-10-13 14:09 ` Shawn O. Pearce
2008-10-13 17:57 ` Johannes Schindelin
2008-10-13 14:23 ` Junio C Hamano
2008-10-13 17:30 ` Junio C Hamano
2008-10-13 18:12 ` Johannes Schindelin
2008-10-13 20:05 ` Daniel Barkalow
2008-10-14 9:49 ` Johannes Schindelin
2008-10-14 15:02 ` Shawn O. Pearce [this message]
2008-10-14 16:04 ` Daniel Barkalow
2008-10-14 16:15 ` Johannes Schindelin
2008-10-14 15:57 ` Daniel Barkalow
2008-10-14 16:17 ` Johannes Schindelin
2008-10-14 16:52 ` Daniel Barkalow
2008-10-14 17:02 ` Daniel Barkalow
2008-10-14 22:07 ` Junio C Hamano
2008-10-14 22:53 ` [PATCH] pull: allow "git pull origin $something:$current_branch" into an unborn branch Junio C Hamano
2008-10-13 17:08 ` [PATCH v2] Fix fetch/pull when run without --update-head-ok Daniel Barkalow
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=20081014150227.GC4856@spearce.org \
--to=spearce@spearce.org \
--cc=Johannes.Schindelin@gmx.de \
--cc=barkalow@iabervon.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).