From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Jeff Garzik <jeff@garzik.org>
Cc: Git Mailing List <git@vger.kernel.org>
Subject: Re: [BUG] Pulling tags no longer works in 1.5.3.4...
Date: Tue, 4 Dec 2007 02:21:36 +0000 (GMT) [thread overview]
Message-ID: <Pine.LNX.4.64.0712040220270.27959@racer.site> (raw)
In-Reply-To: <4754B4AF.8070408@garzik.org>
Hi,
On Mon, 3 Dec 2007, Jeff Garzik wrote:
> Using package git-core-1.5.3.3-3.fc7, I can do the following with kernel git
> trees:
>
> 1) git-clone --reference linux-2.6 linux-2.6 tmp-2.6
>
> 2) time passes (days or weeks)
>
> 3) cd tmp-2.6
> git pull ../linux-2.6
> git pull --tags ../linux-2.6
>
> Result: works as expected.
>
>
>
> Using package git-core-1.5.3.4-1.fc8, step #3 breaks:
>
> [jgarzik@pretzel misc-2.6]$ git pull --tags ../linux-2.6/
> You asked me to pull without telling me which branch you
> want to merge with, and 'branch.master.merge' in
> your configuration file does not tell me either. Please
> name which branch you want to merge on the command line and
> try again (e.g. 'git pull <repository> <refspec>').
> See git-pull(1) for details on the refspec.
Oops.
As a workaround, please do "git fetch --tags ../linux-2.6 && git pull
../linux-2.6/" until it is fixed.
Ciao,
Dscho
next prev parent reply other threads:[~2007-12-04 2:22 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-12-04 2:00 [BUG] Pulling tags no longer works in 1.5.3.4 Jeff Garzik
2007-12-04 2:21 ` Johannes Schindelin [this message]
2007-12-04 2:33 ` Jeff King
2007-12-04 7:41 ` Junio C Hamano
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=Pine.LNX.4.64.0712040220270.27959@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=jeff@garzik.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).