From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Andy Whitcroft <apw@shadowen.org>
Cc: git@vger.kernel.org
Subject: Re: git fetch -- double fetch
Date: Mon, 8 Oct 2007 00:25:26 +0100 (BST) [thread overview]
Message-ID: <Pine.LNX.4.64.0710080022300.4174@racer.site> (raw)
In-Reply-To: <20071007214433.GA30833@shadowen.org>
Hi,
On Sun, 7 Oct 2007, Andy Whitcroft wrote:
> On Sun, Oct 07, 2007 at 05:29:38PM +0100, Johannes Schindelin wrote:
>
> > On Sat, 6 Oct 2007, Andy Whitcroft wrote:
> >
> > > I have recently been seeing repeated fetching of some branches. I
> > > feel this has happened in at least three of my repos on three
> > > distinct projects:
> > >
> > > apw@pinky$ git fetch origin
> > > remote: Generating pack...
> > > remote: Done counting 5 objects.
> > > remote: Deltifying 5 objects...
> > > remote: 100% (5/5) done
> > > Unpacking 5 objects...
> > > remote: Total 5 (delta 0), reused 0 (delta 0)
> > > 100% (5/5) done
> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat
> > > old..new: ce046f0..41c9dde
> > > * refs/remotes/origin/master: fast forward to branch 'master' of ssh://git@abat-dev/var/www/git/abat
> > > old..new: ce046f0..41c9dde
> >
> > What does "git config --get-all remote.origin.fetch" say?
>
> apw@pinky$ git config --get-all remote.origin.fetch
> +refs/heads/master:refs/remotes/origin/master
> +refs/heads/*:refs/remotes/origin/*
> apw@pinky$
>
> I don't think that I did anything to this config, I think that is what
> the clone setup for me.
Actually, I am quite certain that git clone does not produce the first
line; But I think that it was necessary to put in some line like that in
older git, where the first ref was the one being merged by a pull.
But as I suspected, and Daniel replied, too, your issue is that both lines
match "master".
You might want to delete the first line, and use "branch.<name>.remote"
and "branch.<name>.merge" to force pull to merge "master" instead.
In the long run, it might be a good idea to cull duplicates in git-fetch,
but for the moment I have enough other stuff to do ;-)
Ciao,
Dscho
prev parent reply other threads:[~2007-10-07 23:26 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-10-06 18:57 git fetch -- double fetch Andy Whitcroft
2007-10-07 16:29 ` Johannes Schindelin
2007-10-07 21:44 ` Andy Whitcroft
2007-10-07 23:14 ` Daniel Barkalow
2007-10-07 23:25 ` Johannes Schindelin [this message]
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.0710080022300.4174@racer.site \
--to=johannes.schindelin@gmx.de \
--cc=apw@shadowen.org \
--cc=git@vger.kernel.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).